dos2unix'es all files- only one affected : topology.py in the ns3 examples area

[nepi.git] / src / nepi / util / guid.py

diff --git a/src/nepi/util/guid.py b/src/nepi/util/guid.py
index 7f5ea3c..4585211 100644 (file)
--- a/src/nepi/util/guid.py
+++ b/src/nepi/util/guid.py
@@ -1,17 +1,33 @@
-# -*- coding: utf-8 -*-
+#
+#    NEPI, a framework to manage network experiments
+#    Copyright (C) 2013 INRIA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+# FIXME: This class is not thread-safe. 
+# Should it be made thread-safe?
 class GuidGenerator(object):
     def __init__(self):
-        self._guids = list()
+        self._last_guid = 0
 
+    # xxx_next_hiccup - this is used as a plain function, and only in ec.py
     def next(self, guid = None):
-        if guid != None:
-            if guid in self._guids:
-                raise RuntimeError("guid %d is already assigned" % guid)
-        else:
-            last_guid = 0 if len(self._guids) == 0 else self._guids[-1]
-            guid = last_guid + 1 
-        self._guids.append(guid)
-        self._guids.sort()
+        if guid == None:
+            guid = self._last_guid + 1
+
+        self._last_guid = self._last_guid if guid <= self._last_guid else guid
+
         return guid