Changeset 24835 for gs2-extensions/parallel-building/trunk/src

Timestamp:

2011-12-01T12:18:32+13:00 (12 years ago)

Author:

jmt12

Message:

Altered lockfile generation so that it occurs in specific collections tmp directory instead.

File:

• gs2-extensions/parallel-building/trunk/src/src/db2txtl-src/db2txtl.cpp (modified) (3 diffs)

gs2-extensions/parallel-building/trunk/src/src/db2txtl-src/db2txtl.cpp

@@ -37 +37 @@
 #include <stdlib.h>
 #include <fcntl.h>
+#include <string.h>
+#include <sys/stat.h>
 
 #if defined(GSDL_USE_OBJECTSPACE)
@@ -61 +63 @@
 // lock a file on linux
 // [hs, 2 july 2010]
-int lock ( char *filename )
+// - modified to create a locl file local to the collection [jmt12]
+int lock ()
 {
-  int fd2 = open (filename, O_CREAT|O_RDWR, 00644);
+  string file_path ("");
+  char *collect_dir = getenv ("GSDLCOLLECTDIR");
+  if (collect_dir != NULL)
+  {
+    file_path += collect_dir;
+  }
+  file_path += "/tmp";
+  if ( access( file_path.c_str(), 00 ) != 0 )
+  {
+    mkdir(file_path.c_str(), 00777);
+  }
+  file_path += "/gdb.lock";
+  ///out << "txt2dbl::lock(" << file_path << ") => ";
+  int fd2 = open (file_path.c_str(), O_CREAT|O_RDWR, 00644);
   close (fd2);
-  int fd = open (filename, O_RDWR);
-  flock lock = {F_RDLCK, SEEK_SET, 0, 0, 0};
+  int fd = open (file_path.c_str(), O_RDWR);
+  flock lock = {F_WRLCK, SEEK_SET, 0, 0, 0};
   fcntl (fd, F_SETLKW, &lock);
+  ///out << "locked!" << endl;
   return fd;
 }
@@ -93 +110 @@
   // open the database
   // - acquire a lock over the database so we can read from it.
-  int thelock = lock ("gdb.lock");
+  int thelock = lock();
 #ifdef __WIN32__
   dbf = gdbm_open (argv[1], block_size, GDBM_READER, 00664, NULL, 0);