Index: trunk/tools/editor_trends/classes/buffer.py |
— | — | @@ -171,25 +171,28 @@ |
172 | 172 | |
173 | 173 | def write_revisions(self): |
174 | 174 | #t0 = datetime.datetime.now() |
175 | | - #self.group_revisions_by_fileid() |
176 | 175 | file_ids = self.revisions.keys() |
177 | | - for file_id in file_ids: |
178 | | - wait = True |
179 | | - for i, revision in enumerate(self.revisions[file_id]): |
180 | | - if i == 0: |
181 | | - while wait: |
182 | | - #print file_id, self.lock |
| 176 | + while len(self.revisions.keys()) != 0: |
| 177 | + for file_id in file_ids: |
| 178 | + #wait = True |
| 179 | + for i, revision in enumerate(self.revisions[file_id]): |
| 180 | + if i == 0: |
| 181 | + #while wait: |
| 182 | + #print file_id, self.lock |
183 | 183 | if self.lock.available(file_id): |
184 | 184 | fh = self.filehandles[file_id] |
185 | | - wait = False |
186 | | - try: |
187 | | - file_utils.write_list_to_csv(revision, fh) |
188 | | - except Exception, error: |
189 | | - print '''Encountered the following error while writing |
190 | | - revision data to %s: %s''' % (fh, error) |
191 | | - self.lock.release(file_id) |
192 | | - del self.revisions[file_id] |
193 | | - wait = True |
| 185 | + #wait = False |
| 186 | + else: |
| 187 | + break |
| 188 | + try: |
| 189 | + file_utils.write_list_to_csv(revision, fh) |
| 190 | + except Exception, error: |
| 191 | + print '''Encountered the following error while writing |
| 192 | + revision data to %s: %s''' % (fh, error) |
| 193 | + |
| 194 | + self.lock.release(file_id) |
| 195 | + del self.revisions[file_id] |
| 196 | + #wait = True |
194 | 197 | print 'Buffer size: %s' % len(self.revisions.keys()) |
195 | 198 | # t1 = datetime.datetime.now() |
196 | 199 | # print 'Worker %s: %s revisions took %s' % (self.process_id, |