Changeset 415

Timestamp:

08/05/09 11:34:17 (3 years ago)

Author:

pierre

Message:

Finalize the TableIO dependency... Seems that there is also a memory leak while loading a lot of SpikeTrains? from file, one after the other, objects are not properly destroyed, and I don't know why. Need to check

Location:

trunk/src

Files:

• io.py (modified) (2 diffs)
• signals/spikes.py (modified) (2 diffs)

trunk/src/io.py

@@ -31 +31 @@
 import os, logging, cPickle, numpy
 DEFAULT_BUFFER_SIZE = -1
-HAVE_TABLEIO        = False #check_dependency('TableIO')
+HAVE_TABLEIO        = check_dependency('TableIO')
 
 if HAVE_TABLEIO:
@@ -202 +202 @@
     def read_spikes(self, params):
         self.__read_metadata()
-        p = self.__check_params(params)
+        p    = self.__check_params(params)
         from NeuroTools.signals import spikes
-        data = self.get_data()
-        return spikes.SpikeList(data, p['id_list'], p['t_start'], p['t_stop'], p['dims'])
+        data   = self.get_data()
+        result = spikes.SpikeList(data, p['id_list'], p['t_start'], p['t_stop'], p['dims'])
+        del data
+        return result
 
     def read_analogs(self, type, params):

trunk/src/signals/spikes.py

@@ -139 +139 @@
     def __str__(self):
         return str(self.spike_times)
+
+    def __del__(self):
+        pass
 
     def __len__(self):
@@ -822 +825 @@
         if len(self) > 0 and (self.t_start is None or self.t_stop is None):
             self.__calc_startstop()
+        
+        del spikes
+
+    def __del__(self):
+        pass
 
     def id_list(self):