diff options
| author | huangming <huangminghuang@users.noreply.github.com> | 2003-10-20 20:00:24 +0000 |
|---|---|---|
| committer | huangming <huangminghuang@users.noreply.github.com> | 2003-10-20 20:00:24 +0000 |
| commit | 42e68454b22a96fb9d9b293b6f213c08d0456b24 (patch) | |
| tree | 1a368f780e82b4c2e81533c52e8e8e049d7c73b4 | |
| parent | f3d6aeac5fbedf9d4f3db5703f226e42bddffd2a (diff) | |
| download | ATCD-42e68454b22a96fb9d9b293b6f213c08d0456b24.tar.gz | |
ChangeLogTag: Mon Oct 20 14:58:00 2003 Huang-Ming Huang <hh1@cse.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp | 18 |
2 files changed, 10 insertions, 15 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2166db04c57..ee26f228e37 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 20 14:58:00 2003 Huang-Ming Huang <hh1@cse.wustl.edu> + + * orbsvcs/orbsvcs/FtRtEvent/UUID.cpp : + Fixed Cygwin compatibility problem + Mon Oct 20 14:30:48 2003 Venkita Subramonian <venkita@cs.wustl.edu> * orbsvcs/orbsvcs/Makefile.av: Made changes so that @@ -5,7 +10,7 @@ Mon Oct 20 14:30:48 2003 Venkita Subramonian <venkita@cs.wustl.edu> Mon Oct 20 13:12:23 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> - * orbsvcs/orbsvcs/Makefile.av: + * orbsvcs/orbsvcs/Makefile.av: Modified the Makefile to compile SCTP related files when sctp flag is set both to openss7 and lksctp. Initially it was including the diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp index ee80e9d837a..4b47c507b2d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp @@ -138,18 +138,7 @@ UUID::create (unsigned char *buffer) ACE_Time_Value now = ACE_OS::gettimeofday(); - ACE_UINT64 timestamp = - ( - SecondsToJan1970 + - now.sec() - ) * - 10000000 + - now.usec() * - 10 - - // multiplex timestamp with thread id to ensure the uniqueness between thread - + - static_cast<ACE_UINT16>(ACE_OS::thr_self()); + ACE_UINT64 timestamp = (SecondsToJan1970 + now.sec()) * 10000000 + now.usec() * 10; buffer[0] = (unsigned char) (timestamp & 0xff); buffer[1] = (unsigned char) ((timestamp >> 8) & 0xff); @@ -157,10 +146,11 @@ UUID::create (unsigned char *buffer) buffer[3] = (unsigned char) ((timestamp >> 24) & 0xff); buffer[4] = (unsigned char) ((timestamp >> 32) & 0xff); buffer[5] = (unsigned char) ((timestamp >> 40) & 0xff); - buffer[6] = (unsigned char) ((timestamp >> 48) & 0xff); + // multiplex timestamp with thread id to ensure the uniqueness between thread + buffer[6] = (unsigned char) ((timestamp >> 48) & 0xff); // Version number is 1 - buffer[7] = (unsigned char) (((timestamp >> 56) & 0x0f) + 0x10); + buffer[7] = (unsigned char) (((timestamp >> 56) & 0x0f) + 0x10) ACE_UINT16 clockSequence = static_cast< ACE_UINT16>(ACE_OS::rand_r(seed) & 0x2ff); |