Skip to content

Commit b50c03e

Browse files
ska2342stuarthalloway
authored andcommitted
remove msecs from Ref.TVal
Signed-off-by: Stuart Halloway <stu@thinkrelevance.com>
1 parent c0596c9 commit b50c03e

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

src/jvm/clojure/lang/LockingTransaction.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ Object run(Callable fn) throws Exception{
305305

306306
//at this point, all values calced, all refs to be written locked
307307
//no more client code to be called
308-
long msecs = System.currentTimeMillis();
309308
long commitPoint = getCommitPoint();
310309
for(Map.Entry<Ref, Object> e : vals.entrySet())
311310
{
@@ -316,20 +315,19 @@ Object run(Callable fn) throws Exception{
316315

317316
if(ref.tvals == null)
318317
{
319-
ref.tvals = new Ref.TVal(newval, commitPoint, msecs);
318+
ref.tvals = new Ref.TVal(newval, commitPoint);
320319
}
321320
else if((ref.faults.get() > 0 && hcount < ref.maxHistory)
322321
|| hcount < ref.minHistory)
323322
{
324-
ref.tvals = new Ref.TVal(newval, commitPoint, msecs, ref.tvals);
323+
ref.tvals = new Ref.TVal(newval, commitPoint, ref.tvals);
325324
ref.faults.set(0);
326325
}
327326
else
328327
{
329328
ref.tvals = ref.tvals.next;
330329
ref.tvals.val = newval;
331330
ref.tvals.point = commitPoint;
332-
ref.tvals.msecs = msecs;
333331
}
334332
if(ref.getWatches().count() > 0)
335333
notify.add(new Notify(ref, oldval, newval));

src/jvm/clojure/lang/Ref.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,21 @@ public Ref setMaxHistory(int maxHistory){
4747
public static class TVal{
4848
Object val;
4949
long point;
50-
long msecs;
5150
TVal prior;
5251
TVal next;
5352

54-
TVal(Object val, long point, long msecs, TVal prior){
53+
TVal(Object val, long point, TVal prior){
5554
this.val = val;
5655
this.point = point;
57-
this.msecs = msecs;
5856
this.prior = prior;
5957
this.next = prior.next;
6058
this.prior.next = this;
6159
this.next.prior = this;
6260
}
6361

64-
TVal(Object val, long point, long msecs){
62+
TVal(Object val, long point){
6563
this.val = val;
6664
this.point = point;
67-
this.msecs = msecs;
6865
this.next = this;
6966
this.prior = this;
7067
}
@@ -92,7 +89,7 @@ public Ref(Object initVal,IPersistentMap meta) {
9289
this.id = ids.getAndIncrement();
9390
this.faults = new AtomicInteger();
9491
this.lock = new ReentrantReadWriteLock();
95-
tvals = new TVal(initVal, 0, System.currentTimeMillis());
92+
tvals = new TVal(initVal, 0);
9693
}
9794

9895
//the latest val

0 commit comments

Comments
 (0)