7u83/OpenSeSim
1
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Better event_queue

Browse Source
This commit is contained in:
7u83 2017-03-05 16:08:08 +01:00
parent 03f3f9138d
commit 4709d42d30
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/sesim/Scheduler.java
View File

@ -106,17 +106,24 @@ public class Scheduler extends Thread {
long last_time_millis = System.currentTimeMillis(); long last_time_millis = System.currentTimeMillis();
double current_time_millis = 0.0; double current_time_millis = 0.0;
Clock clock;
/** /**
* *
* @return * @return
*/ */
public long currentTimeMillis1() { public long currentTimeMillis1() {
long diff = System.currentTimeMillis() - last_time_millis; long cur = System.currentTimeMillis();
last_time_millis += diff;
if (diff == 0) { long diff = cur - last_time_millis;
diff++;
} last_time_millis = cur;
// last_time_millis += diff;
//if (diff == 0) {
// diff++;
// }
if (pause) { if (pause) {
return (long) this.current_time_millis; return (long) this.current_time_millis;
} }
@ -151,9 +158,10 @@ public class Scheduler extends Thread {
} }
} }
//LinkedList<TimerTaskDef> set_tasks = new LinkedList<>(); //LinkedList<TimerTaskDef> set_tasks = new LinkedList<>();
ConcurrentLinkedQueue<TimerTaskDef> set_tasks = new ConcurrentLinkedQueue<>(); ConcurrentLinkedQueue<TimerTaskDef> set_tasks = new ConcurrentLinkedQueue<>();
/** /**
* *
* @param e * @param e
@ -240,7 +248,6 @@ public class Scheduler extends Thread {
public long runEvents() { public long runEvents() {
synchronized (event_queue) { synchronized (event_queue) {
// System.out.printf("Have Event Queue in run events %d\n", Thread.currentThread().getId());
if (event_queue.isEmpty()) { if (event_queue.isEmpty()) {
return -1; return -1;
@ -249,28 +256,24 @@ public class Scheduler extends Thread {
long t = event_queue.firstKey(); long t = event_queue.firstKey();
long ct = currentTimeMillis1(); long ct = currentTimeMillis1();
if (t <= ct) { if (t > ct) {
this.current_time_millis = t; // System.out.printf("Leave Event Queue in run events %d\n", Thread.currentThread().getId());
SortedSet s = event_queue.get(t); System.out.printf("Sleeping somewat %d\n", (long) (t - this.current_time_millis / this.acceleration));
Object rc = event_queue.remove(t);
Iterator<TimerTask> it = s.iterator();
while (it.hasNext()) {
TimerTask e = it.next();
long next_t = this.fireEvent(e);
if (next_t == 0) {
next_t++;
}
this.addTimerTask(e, next_t + t);
}
// System.out.printf("Leave Event Queue in run events a %d\n", Thread.currentThread().getId());
return 0;
} else {
// System.out.printf("Leave Event Queue in run events %d\n", Thread.currentThread().getId());
return (t - currentTimeMillis()) / (long) this.acceleration; return (t - currentTimeMillis()) / (long) this.acceleration;
} }
// if (t <= ct) {
this.current_time_millis = t;
SortedSet s = event_queue.get(t);
Object rc = event_queue.remove(t);
Iterator<TimerTask> it = s.iterator();
while (it.hasNext()) {
TimerTask e = it.next();
long next_t = this.fireEvent(e);
this.addTimerTask(e, next_t + t);
}
return 0;
} }
} }