diff options
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/ace/Mem_Map.cpp | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index c998d3f92a6..57b3c13afec 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Wed May 23 09:40:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Mem_Map.cpp: + Use shm_open/shm_unlink on VxWorks. This doesn't fix the failing of + the tests using mmap on our targets because they are using a NFS file + system and we have identified several problems with that which have + been reported to WindRiver. + Wed May 23 07:17:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Mem_Map_Test.cpp: diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp index ee9f7b9717e..3cab425ec00 100644 --- a/ACE/ace/Mem_Map.cpp +++ b/ACE/ace/Mem_Map.cpp @@ -95,7 +95,7 @@ ACE_Mem_Map::map_it (ACE_HANDLE handle, // Set length to file_request or size_t max. this->length_ = ACE_Utils::truncate_cast<size_t> (current_file_length - offset); else - { + { // Make sure that we have not been asked to do the impossible. if (static_cast<ACE_UINT64> (length_request) + static_cast<ACE_UINT64> (offset) @@ -161,7 +161,7 @@ ACE_Mem_Map::open (const ACE_TCHAR *file_name, { ACE_TRACE ("ACE_Mem_Map::open"); -#if defined(INTEGRITY) || defined (__QNXNTO__) +#if defined (INTEGRITY) || defined (__QNXNTO__) || defined (ACE_VXWORKS) this->handle_ = ACE_OS::shm_open (file_name, flags, mode, sa); #elif defined (ACE_OPENVMS) ACE_OSCALL (::open (file_name, flags, mode, "shr=get,put,upd"), ACE_HANDLE, -1, this->handle_); @@ -298,7 +298,7 @@ ACE_Mem_Map::remove (void) this->close (); if (this->filename_[0] != '\0') -#if defined (__QNXNTO__) +#if defined (INTEGRITY) || defined (__QNXNTO__) || defined (ACE_VXWORKS) return ACE_OS::shm_unlink (this->filename_); #else return ACE_OS::unlink (this->filename_); |