Changeset 76 for proiecte/ptvs/src/vnsim/core/Engine.java

Timestamp:

Jan 7, 2010, 9:35:14 AM (14 years ago)

Author:

(none)

Message:

 

File:

• proiecte/ptvs/src/vnsim/core/Engine.java (modified) (7 diffs)

proiecte/ptvs/src/vnsim/core/Engine.java

@@ -653 +653 @@
                 int numThreads=intersectii.size();
                 
-                EventProcessingThread processingThreads[] = new EventProcessingThread[numThreads];
-                
+                //v1
+                Runnable processingThreads[] = new Runnable[numThreads];
+                //
                 
                 while (true) {
@@ -665 +666 @@
                         // extrag un eveniment din coada !!!!! acum doar il extrag.. cand intru in playEvent il si scot cu remove(0)
                         Event e = (Event) eventQueue.get(0);
+                        if (e == null) continue;
                         System.out.println("\n----------- number of events in the queue:"+eventQueue.size() );
                         
@@ -675 +677 @@
                 
                         if((e instanceof SendEvent) || (e instanceof ReceiveEvent)){
-                                
+                                e = (Event)eventQueue.remove(0);
                                 /**
                                  * Mihaela Teler
@@ -726 +728 @@
                                                 
                                                         System.out.print("SendEvent: ");
-                                                        processingThreads[indexClosestIntersection] = new SendEventProcessingThread(e,crtTime);
+                                                        processingThreads[indexClosestIntersection] = new SendEventProcessingThread(e,this);
                                                 }
                                         else {                                  
                                                         System.out.print("ReceiveEvent: ");
-                                                        processingThreads[indexClosestIntersection] = new ReceiveEventProcessingThread(e,crtTime);
+                                                        processingThreads[indexClosestIntersection] = new ReceiveEventProcessingThread(e,this);
                                                 }
                                         
                                         System.out.println("Processing thread "+indexClosestIntersection+" from intersection "+intersectii.get(indexClosestIntersection));
                                         //processingThreads[indexClosestIntersection].start();// cu start nu merge ... why????
-                                        processingThreads[indexClosestIntersection].run();
+                                        new Thread(processingThreads[indexClosestIntersection]).start();
                                         cnt++;
                                 }
@@ -743 +745 @@
                         
                         else if (e.getTime() == crtTime) {
-                                playEvent();
+                                playEvent(null);
                                 cnt++;
                         } else
@@ -988 +990 @@
          * 
          */
-        public static void playEvent() {
+        public void playEvent(Event ev) {
                 
                 //System.out.println(">> Thread:"+Thread.currentThread().getName());
@@ -998 +1000 @@
 
                 Event e = null;
+                if (ev == null) {
                 synchronized (eventQueue) {
                         e = eventQueue.remove(0);
                 }
+                } else e = ev;
                 //System.out.print(e.toString()+", ");
                 //System.out.flush();