[darwinbuild-changes] [483] branches/PR-6688645/darwinup/Depot.cpp

[source_changes at macosforge.org]

Revision: 483
          http://trac.macosforge.org/projects/darwinbuild/changeset/483
Author:   wsiegrist at apple.com
Date:     2009-03-18 14:34:32 -0700 (Wed, 18 Mar 2009)
Log Message:
-----------
Replace overly paranoid lock checking with simple result testing

Modified Paths:
--------------
    branches/PR-6688645/darwinup/Depot.cpp

Modified: branches/PR-6688645/darwinup/Depot.cpp
===================================================================
--- branches/PR-6688645/darwinup/Depot.cpp	2009-03-18 21:25:33 UTC (rev 482)
+++ branches/PR-6688645/darwinup/Depot.cpp	2009-03-18 21:34:32 UTC (rev 483)
@@ -62,10 +62,16 @@
 	mkdir(m_depot_path,    m_depot_mode);
 	mkdir(m_archives_path, m_depot_mode);
 
-	(void)this->lock(LOCK_SH);
+	int res = 0;
+
+	res = this->lock(LOCK_SH);
+	if (res == 0) {
+	  m_is_locked = 1;
+	}
+
 	int exists = is_regular_file(m_database_path);
 
-	int res = sqlite3_open(m_database_path, &m_db);
+	res = sqlite3_open(m_database_path, &m_db);
 	if (res != 0) {
 		sqlite3_close(m_db);
 		m_db = NULL;
@@ -982,9 +988,6 @@
 
 int Depot::lock(int operation) {
 	int res = 0;
-	if (m_is_locked) {
-	        fprintf(stderr, "Warning: attempt to over lock the depot\n");
-	}
 	if (m_lock_fd == -1) {
 		m_lock_fd = open(m_depot_path, O_RDONLY);
 		if (m_lock_fd == -1) {
@@ -995,22 +998,15 @@
 	res = flock(m_lock_fd, operation);
 	if (res == -1) {
 		perror(m_depot_path);
-	} else {
-	        m_is_locked = 1;
 	}
 	return res;
 }
 
 int Depot::unlock(void) {
 	int res = 0;
-	if (!m_is_locked) {
-	        fprintf(stderr, "Warning: attempt to over unlock the depot\n");
-	}
 	res = flock(m_lock_fd, LOCK_UN);
 	if (res == -1) {
 		perror(m_depot_path);
-	} else {
-	        m_is_locked = 0;
 	}
 	close(m_lock_fd);
 	m_lock_fd = -1;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20090318/06846d10/attachment.html>