diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-09-10 12:51:57 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-09-10 12:51:57 +0000 |
| commit | 363d867e309986a080713a16a39ec1852031655e (patch) | |
| tree | d4b6fa99e356bb1f1057fad24fd7002df37a50c6 | |
| parent | 8206f21b43b89e1ec2dabab29de0f3ed4515cce6 (diff) | |
| download | ATCD-363d867e309986a080713a16a39ec1852031655e.tar.gz | |
ChangeLogTag: Wed Sep 10 07:48:55 2003 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 32 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 9 | ||||
| -rw-r--r-- | TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc | 2 |
3 files changed, 31 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 273b569fa96..e8ea5a8eb92 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,19 +1,33 @@ +Wed Sep 10 07:48:55 2003 Chad Elliott <elliott_c@ociweb.com> + + * TAO_IDL/be/be_interface.cpp: + + Added some randomization to the generation of the gperf input + filename. This allows multiple tao_idl instances to process idl + files that have the same but are in different directories. + + * tests/Oneway_Buffering/Oneway_Buffering.mpc: + + Reverted my change from Mon Sep 8 07:06:38 2003. With my + automatic parallel dependency change for MPC, this is not + necessary. + Mon Sep 8 23:29:17 2003 Ossama Othman <ossama@dre.vanderbilt.edu> - * tao/IOP_IORC.h: + * tao/IOP_IORC.h: - Moved HPUX-specific "#undef IOR" immediately after the last - header include. It ended up being hidden in some cases, which - causes syntax errors in the `IOP_IORC.i' inline file to appear. + Moved HPUX-specific "#undef IOR" immediately after the last + header include. It ended up being hidden in some cases, which + causes syntax errors in the `IOP_IORC.i' inline file to appear. Mon Sep 8 23:21:51 2003 Ossama Othman <ossama@dre.vanderbilt.edu> - * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile (LIBS): - * examples/RTScheduling/MIF_Scheduler/Makefile (LIBS): + * examples/RTScheduling/Fixed_Priority_Scheduler/Makefile (LIBS): + * examples/RTScheduling/MIF_Scheduler/Makefile (LIBS): - Added missing "RTCORBA", "TAO_Svc_Utils" and "TAO_IORTable" - libraries to the list of libraries to link. They must be - explicitly listed for statically linked builds. + Added missing "RTCORBA", "TAO_Svc_Utils" and "TAO_IORTable" + libraries to the list of libraries to link. They must be + explicitly listed for statically linked builds. Mon Sep 8 18:56:30 2003 Jeff Parsons <j.parsons@vanderbilt.edu> diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 587d7e5c554..e4a0df44a5d 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -766,17 +766,24 @@ be_interface::gen_operation_table (const char *flat_name, // collect the input for the gperf program. { // Temp file name. + // We must randomize this a bit in order to avoid problems with + // processing more than one idl file (in separate processes) with + // the same name (in different directories). char *temp_file = 0; ACE_NEW_RETURN (temp_file, char [ACE_OS::strlen (idl_global->temp_dir ()) + + 11 // The number of possible digits in + // a 32-bit number plus a dot + ACE_OS::strlen (flat_name) + ACE_OS::strlen (".gperf") + 1], -1); + ACE_RANDR_TYPE seed = ACE_OS::time(); ACE_OS::sprintf (temp_file, - "%s%s.gperf", + "%s%d.%s.gperf", idl_global->temp_dir (), + ACE_OS::rand_r(seed), flat_name); // QNX can't handle individual file names (path components) diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc index 8ed89deda41..73475873cb7 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc @@ -15,7 +15,6 @@ project(*Server): messaging, taoserver, corba_messaging { // succeeds. project(*Client): messaging, taoserver, corba_messaging { exename = client - after += *Server Source_Files { TestC.cpp client.cpp @@ -24,7 +23,6 @@ project(*Client): messaging, taoserver, corba_messaging { project(*Admin): messaging, taoserver, corba_messaging { exename = admin - after += *Server Source_Files { Oneway_Buffering_Admin.cpp admin.cpp |