Changeset 895

Timestamp:

31/08/2006 23:44:18 (5 years ago)

Author:

chris

Message:

Revert to trunk

File:

• box/chris/merge/lib/raidfile/RaidFileWrite.cpp (modified) (10 diffs)

box/chris/merge/lib/raidfile/RaidFileWrite.cpp

@@ -105 +105 @@
 
         // Attempt to open
-        mOSFileHandle = ::open(writeFilename.c_str(), 
-                O_WRONLY | O_CREAT | O_BINARY,
+        mOSFileHandle = ::open(writeFilename.c_str(), O_WRONLY | O_CREAT,
                 S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
         if(mOSFileHandle == -1)
@@ -117 +116 @@
         int errnoBlock = EWOULDBLOCK;
         if(::flock(mOSFileHandle, LOCK_EX | LOCK_NB) != 0)
-#elif HAVE_DECL_F_SETLK
+#else
         int errnoBlock = EAGAIN;
         struct flock desc;
@@ -125 +124 @@
         desc.l_len = 0;
         if(::fcntl(mOSFileHandle, F_SETLK, &desc) != 0)
-#else
-        int errnoBlock = ENOSYS;
-        if (0)
 #endif
         {
@@ -247 +243 @@
         
         // Rename it into place -- BEFORE it's closed so lock remains
-
-#ifdef WIN32
-        // Except on Win32 which doesn't allow renaming open files
-        // Close file...
-        if(::close(mOSFileHandle) != 0)
-        {
-                THROW_EXCEPTION(RaidFileException, OSError)
-        }
-        mOSFileHandle = -1;
-#endif // WIN32
-
         RaidFileController &rcontroller(RaidFileController::GetController());
         RaidFileDiscSet rdiscSet(rcontroller.GetDiscSet(mSetNumber));
@@ -264 +249 @@
         // And the current name
         std::string renameFrom(renameTo + 'X');
-
-#ifdef WIN32
-        // need to delete the target first
-        if(::unlink(renameTo.c_str()) != 0 && 
-                GetLastError() != ERROR_FILE_NOT_FOUND)
-        {
-                THROW_EXCEPTION(RaidFileException, OSError)
-        }
-#endif
-
         if(::rename(renameFrom.c_str(), renameTo.c_str()) != 0)
         {
@@ -279 +254 @@
         }
         
-#ifndef WIN32   
         // Close file...
         if(::close(mOSFileHandle) != 0)
@@ -286 +260 @@
         }
         mOSFileHandle = -1;
-#endif // !WIN32
         
         // Raid it?
@@ -320 +293 @@
         
         // Unlink and close it
-
-#ifdef WIN32
-        // On Win32 we must close it first
-        if (::close(mOSFileHandle) != 0 ||
-                ::unlink(writeFilename.c_str()) != 0)
-#else // !WIN32
-        if (::unlink(writeFilename.c_str()) != 0 ||
-                ::close(mOSFileHandle) != 0)
-#endif // !WIN32
+        if((::unlink(writeFilename.c_str()) != 0)
+                || (::close(mOSFileHandle) != 0))
         {
                 THROW_EXCEPTION(RaidFileException, OSError)
@@ -423 +389 @@
         {
 #if HAVE_DECL_O_EXLOCK
-                FileHandleGuard<(O_WRONLY | O_CREAT | O_EXCL | O_EXLOCK | O_BINARY)> stripe1(stripe1FilenameW.c_str());
-                FileHandleGuard<(O_WRONLY | O_CREAT | O_EXCL | O_EXLOCK | O_BINARY)> stripe2(stripe2FilenameW.c_str());
-                FileHandleGuard<(O_WRONLY | O_CREAT | O_EXCL | O_EXLOCK | O_BINARY)> parity(parityFilenameW.c_str());
+                FileHandleGuard<(O_WRONLY | O_CREAT | O_EXCL | O_EXLOCK)> stripe1(stripe1FilenameW.c_str());
+                FileHandleGuard<(O_WRONLY | O_CREAT | O_EXCL | O_EXLOCK)> stripe2(stripe2FilenameW.c_str());
+                FileHandleGuard<(O_WRONLY | O_CREAT | O_EXCL | O_EXLOCK)> parity(parityFilenameW.c_str());
 #else
-                FileHandleGuard<(O_WRONLY | O_CREAT | O_EXCL | O_BINARY)> stripe1(stripe1FilenameW.c_str());
-                FileHandleGuard<(O_WRONLY | O_CREAT | O_EXCL | O_BINARY)> stripe2(stripe2FilenameW.c_str());
-                FileHandleGuard<(O_WRONLY | O_CREAT | O_EXCL | O_BINARY)> parity(parityFilenameW.c_str());
+                FileHandleGuard<(O_WRONLY | O_CREAT | O_EXCL)> stripe1(stripe1FilenameW.c_str());
+                FileHandleGuard<(O_WRONLY | O_CREAT | O_EXCL)> stripe2(stripe2FilenameW.c_str());
+                FileHandleGuard<(O_WRONLY | O_CREAT | O_EXCL)> parity(parityFilenameW.c_str());
 #endif
 
@@ -565 +531 @@
                 stripe2.Close();
                 stripe1.Close();
-
-#ifdef WIN32
-                // Must delete before renaming
-                #define CHECK_UNLINK(file) \
-                { \
-                        if (::unlink(file) != 0 && errno != ENOENT) \
-                        { \
-                                THROW_EXCEPTION(RaidFileException, OSError); \
-                        } \
-                }
-                CHECK_UNLINK(stripe1Filename.c_str());
-                CHECK_UNLINK(stripe2Filename.c_str());
-                CHECK_UNLINK(parityFilename.c_str());
-                #undef CHECK_UNLINK
-#endif
                 
                 // Rename them into place