summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGregory Becker <becker33@llnl.gov>2015-08-25 15:11:18 -0700
committerGregory Becker <becker33@llnl.gov>2015-08-25 15:11:18 -0700
commit4a2bd1753a3c0b96c0b38ee9ec909cbf98308125 (patch)
tree987e9a45958e7fe7fa03c419a165c5fa24d3aa7e /lib
parentfb1874165b420c5a8866bec7ac87a98e97f2b670 (diff)
downloadspack-4a2bd1753a3c0b96c0b38ee9ec909cbf98308125.tar.gz
spack-4a2bd1753a3c0b96c0b38ee9ec909cbf98308125.tar.bz2
spack-4a2bd1753a3c0b96c0b38ee9ec909cbf98308125.tar.xz
spack-4a2bd1753a3c0b96c0b38ee9ec909cbf98308125.zip
Added dependency indices to database, ensuring correctly reconstructed specs from database
Began work on file locking, currently commented out.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/database.py102
-rw-r--r--lib/spack/spack/package.py1
2 files changed, 78 insertions, 25 deletions
diff --git a/lib/spack/spack/database.py b/lib/spack/spack/database.py
index d027db312f..7e2c3ac079 100644
--- a/lib/spack/spack/database.py
+++ b/lib/spack/spack/database.py
@@ -30,6 +30,7 @@ import imp
import time
import copy
+import errno
from external import yaml
from external.yaml.error import MarkedYAMLError
@@ -69,6 +70,10 @@ class Database(object):
self.root = root
self.file_name = file_name
self.file_path = join_path(self.root,self.file_name)
+
+ self.lock_name = "db_lock"
+ self.lock_path = join_path(self.root,self.lock_name)
+
self.data = []
self.last_write_time = 0
@@ -86,17 +91,38 @@ class Database(object):
if file==None:
return
- self.data = []
- for sp in file['database']:
+ data = {}
+ for index, sp in file['database'].items():
spec = Spec.from_node_dict(sp['spec'])
+ deps = sp['dependency_indices']
path = sp['path']
dep_hash = sp['hash']
- db_entry = {'spec': spec, 'path': path, 'hash':dep_hash}
- self.data.append(db_entry)
+ db_entry = {'deps':deps, 'spec': spec, 'path': path, 'hash':dep_hash}
+ data[index] = db_entry
+
+ for sph in data.values():
+ for idx in sph['deps']:
+ sph['spec'].dependencies[data[idx]['spec'].name] = data[idx]['spec']
+
+ self.data = data.values()
def read_database(self):
- """Reread Database from the data in the set location"""
+ """
+ Re-read Database from the data in the set location
+ If the cache is fresh, return immediately.
+ Implemented with mkdir locking for the database file.
+ """
+ if not self.is_dirty():
+ return
+ """
+ while True:
+ try:
+ os.mkdir(self.lock_path)
+ break
+ except OSError as err:
+ pass
+ """
if os.path.isfile(self.file_path):
with open(self.file_path,'r') as f:
self.from_yaml(f)
@@ -104,6 +130,8 @@ class Database(object):
#The file doesn't exist, construct empty data.
self.data = []
+# os.rmdir(self.lock_path)
+
def write_database_to_yaml(self,stream):
"""
@@ -111,24 +139,54 @@ class Database(object):
Then stream all data to YAML
"""
node_list = []
- for sp in self.data:
+ spec_list = [sph['spec'] for sph in self.data]
+
+ for sph in self.data:
node = {}
- node['spec']=Spec.to_node_dict(sp['spec'])
-# node['spec'][sp['spec'].name]['hash']=sp['spec'].dag_hash()
- node['hash']=sp['hash']
- node['path']=sp['path']
+ deps = []
+ for name,spec in sph['spec'].dependencies.items():
+ deps.append(spec_list.index(spec))
+ node['spec']=Spec.to_node_dict(sph['spec'])
+ node['hash']=sph['hash']
+ node['path']=sph['path']
+ node['dependency_indices']=deps
node_list.append(node)
- return yaml.dump({ 'database' : node_list},
+
+ node_dict = dict(enumerate(node_list))
+ return yaml.dump({ 'database' : node_dict},
stream=stream, default_flow_style=False)
def write(self):
- """Write the database to the standard location"""
- #creates file if necessary
+ """
+ Write the database to the standard location
+ Implements mkdir locking for the database file
+ """
+ """
+ while True:
+ try:
+ os.mkdir(self.lock_path)
+ break
+ except OSError as err:
+ pass
+ """
with open(self.file_path,'w') as f:
self.last_write_time = int(time.time())
self.write_database_to_yaml(f)
+ # os.rmdir(self.lock_path)
+
+
+ def get_index_of(self, spec):
+ """
+ Returns the index of a spec in the database
+ If unable to find the spec it returns -1
+ """
+ for index, sph in enumerate(self.data):
+ if sph['spec'] == spec:
+ return index
+ return -1
+
def is_dirty(self):
"""
@@ -140,12 +198,11 @@ class Database(object):
# @_autospec
def add(self, spec, path):
- """Re-read the database from the set location if data is dirty
+ """Read the database from the set location
Add the specified entry as a dict
Write the database back to memory
"""
- if self.is_dirty():
- self.read_database()
+ self.read_database()
sph = {}
sph['spec']=spec
@@ -160,16 +217,14 @@ class Database(object):
@_autospec
def remove(self, spec):
"""
- Re-reads the database from the set location if data is dirty
+ Reads the database from the set location
Searches for and removes the specified spec
Writes the database back to memory
"""
- if self.is_dirty():
- self.read_database()
+ self.read_database()
for sp in self.data:
-
- if sp['hash'] == spec.dag_hash() and sp['spec'] == Spec.from_node_dict(spec.to_node_dict()):
+ if sp['hash'] == spec.dag_hash() and sp['spec'] == spec:
self.data.remove(sp)
self.write()
@@ -204,13 +259,10 @@ class Database(object):
Read installed package names from the database
and return their specs
"""
- if self.is_dirty():
- self.read_database()
+ self.read_database()
installed = []
for sph in self.data:
- sph['spec'].normalize()
- sph['spec'].concretize()
installed.append(sph['spec'])
return installed
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index acf558d639..929e0c086c 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -557,6 +557,7 @@ class Package(object):
@property
def installed(self):
+ print self.prefix
return os.path.isdir(self.prefix)