[Cmake-commits] CMake branch, next, updated. v3.2.1-1187-gd4e11ba

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d4e11ba12596763942888e1c7b6b46949e687c73 (commit)
       via  2ad054ff6719728244aac1ec0f9e5f872d56b2e9 (commit)
      from  a9282d84b211041bb8552d34c9e3e7c633873526 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4e11ba12596763942888e1c7b6b46949e687c73
commit d4e11ba12596763942888e1c7b6b46949e687c73
Merge: a9282d8 2ad054f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 24 11:13:41 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 24 11:13:41 2015 -0400

    Merge topic 'FileLockUnix-close-file' into next
    
    2ad054ff cmFileLockUnix: Close file descriptor when releasing a lock


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ad054ff6719728244aac1ec0f9e5f872d56b2e9
commit 2ad054ff6719728244aac1ec0f9e5f872d56b2e9
Author:     Betsy McPhail <betsy.mcphail at kitware.com>
AuthorDate: Mon Mar 23 16:32:12 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 24 11:10:34 2015 -0400

    cmFileLockUnix: Close file descriptor when releasing a lock
    
    The file lock functionality added in commit v3.2.0-rc1~297^2~1 (file:
    Add LOCK subcommand to do file and directory locking, 2014-11-26) forgot
    to close the lock file descriptors on UNIX.  Eventually it was possible
    to run out of file descriptors and locks could not longer be acquired.
    Fix this by closing the file descriptor when we are done with it.

diff --git a/Source/cmFileLockUnix.cxx b/Source/cmFileLockUnix.cxx
index fc18a64..36a2d72 100644
--- a/Source/cmFileLockUnix.cxx
+++ b/Source/cmFileLockUnix.cxx
@@ -15,6 +15,7 @@
 #include <errno.h> // errno
 #include <stdio.h> // SEEK_SET
 #include <fcntl.h>
+#include <unistd.h>
 #include "cmSystemTools.h"
 
 cmFileLock::cmFileLock(): File(-1)
@@ -31,6 +32,9 @@ cmFileLockResult cmFileLock::Release()
 
   this->Filename = "";
 
+  ::close(this->File);
+  this->File = -1;
+
   if (lockResult == 0)
     {
     return cmFileLockResult::MakeOk();

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake