Author: Remi Meier <[email protected]>
Branch:
Changeset: r536:f53edba476a6
Date: 2013-10-15 11:28 +0200
http://bitbucket.org/pypy/stmgc/changeset/f53edba476a6/
Log: remove copy-paste left-over
diff --git a/c4/et.c b/c4/et.c
--- a/c4/et.c
+++ b/c4/et.c
@@ -23,7 +23,7 @@
i++;
}
cur += sprintf(cur, "tid=%ld", stm_get_tid(obj));
- cur += sprintf(cur, " : rev=%lx : orig=%lx",
+ cur += sprintf(cur, " : rev=0x%lx : orig=0x%lx",
(long)obj->h_revision, (long)obj->h_original);
return tmp_buf;
}
diff --git a/c4/stmsync.c b/c4/stmsync.c
--- a/c4/stmsync.c
+++ b/c4/stmsync.c
@@ -222,14 +222,14 @@
}
else {
CommitTransaction();
- if (d->active != 2) {
- unsigned long limit = d->reads_size_limit_nonatomic;
- if (limit != 0 && limit < (stm_regular_length_limit >> 1))
- limit = (limit << 1) | 1;
- else
- limit = stm_regular_length_limit;
- d->reads_size_limit_nonatomic = limit;
- }
+
+ unsigned long limit = d->reads_size_limit_nonatomic;
+ if (limit != 0 && limit < (stm_regular_length_limit >> 1))
+ limit = (limit << 1) | 1;
+ else
+ limit = stm_regular_length_limit;
+ d->reads_size_limit_nonatomic = limit;
+
stm_begin_transaction(buf, longjmp_callback);
}
}
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
