1818#define DEFAULT_LISTENHOST "0.0.0.0"
1919#define DEFAULT_LISTENPORT 5431
2020
21+ static xid_t get_global_xmin ();
22+
2123L2List active_transactions = {& active_transactions ,& active_transactions };
2224L2List * free_transactions ;
2325
2426// We reserve the local xids if they fit between (prev, next) range, and
2527// reserve something in (next, x) range otherwise, moving 'next' after 'x'.
2628xid_t prev_gxid ,next_gxid ;
29+ xid_t global_xmin = INVALID_XID ;
2730
2831typedef struct client_userdata_t {
2932int id ;
@@ -55,6 +58,9 @@ inline static void free_transaction(Transaction* t)
5558l2_list_unlink (& t -> elem );
5659t -> elem .next = free_transactions ;
5760free_transactions = & t -> elem ;
61+ if (t -> xmin == global_xmin ) {
62+ global_xmin = get_global_xmin ();
63+ }
5864}
5965
6066
@@ -246,18 +252,12 @@ static void onreserve(client_t client, int argc, xid_t *argv) {
246252}
247253
248254static xid_t get_global_xmin () {
249- int j ;
250255xid_t xmin = next_gxid ;
251256Transaction * t ;
252257for (t = (Transaction * )active_transactions .next ;t != (Transaction * )& active_transactions ;t = (Transaction * )t -> elem .next ) {
253- j = t -> snapshots_count > MAX_SNAPSHOTS_PER_TRANS ?MAX_SNAPSHOTS_PER_TRANS :t -> snapshots_count ;
254- while (-- j >=0 ) {
255- Snapshot * s = transaction_snapshot (t ,j );
256- if (s -> xmin < xmin ) {
257- xmin = s -> xmin ;
258- }
259- // minor TODO: Use 'times_sent' to generate a bit greater xmin?
260- }
258+ if (t -> xmin < xmin ) {
259+ xmin = t -> xmin ;
260+ }
261261}
262262return xmin ;
263263}
@@ -285,7 +285,7 @@ static void onbegin(client_t client, int argc, xid_t *argv) {
285285transaction_clear (t );
286286l2_list_link (& active_transactions ,& t -> elem );
287287
288- prev_gxid = t -> xid = t -> xmin = next_gxid ++ ;
288+ prev_gxid = t -> xid = next_gxid ++ ;
289289t -> snapshots_count = 0 ;
290290t -> size = 1 ;
291291
@@ -303,16 +303,18 @@ static void onbegin(client_t client, int argc, xid_t *argv) {
303303return ;
304304}
305305
306- xid_t gxmin = get_global_xmin ();
307306Snapshot * snap = transaction_next_snapshot (t );
308307gen_snapshot (snap );// FIXME: increase 'times_sent' here? see also 4765234987
309308t -> xmin = snap -> xmin ;
309+ if (global_xmin == INVALID_XID ) {
310+ global_xmin = snap -> xmin ;
311+ }
310312
311313xid_t ok = RES_OK ;
312314client_message_start (client ); {
313315client_message_append (client ,sizeof (xid_t ),& ok );
314316client_message_append (client ,sizeof (xid_t ),& t -> xid );
315- client_message_append (client ,sizeof (xid_t ),& gxmin );
317+ client_message_append (client ,sizeof (xid_t ),& global_xmin );
316318client_message_append (client ,sizeof (xid_t ),& snap -> xmin );
317319client_message_append (client ,sizeof (xid_t ),& snap -> xmax );
318320client_message_append (client ,sizeof (xid_t )* snap -> nactive ,snap -> active );
@@ -464,15 +466,13 @@ static void onsnapshot(client_t client, int argc, xid_t *argv) {
464466gen_snapshot (transaction_next_snapshot (t ));
465467}
466468
467- xid_t gxmin = get_global_xmin ();
468-
469469Snapshot * snap = transaction_snapshot (t ,CLIENT_SNAPSENT (client )++ );
470470snap -> times_sent += 1 ;// FIXME: does times_sent get used anywhere? see also 4765234987
471471
472472xid_t ok = RES_OK ;
473473client_message_start (client ); {
474474client_message_append (client ,sizeof (xid_t ),& ok );
475- client_message_append (client ,sizeof (xid_t ),& gxmin );
475+ client_message_append (client ,sizeof (xid_t ),& global_xmin );
476476client_message_append (client ,sizeof (xid_t ),& snap -> xmin );
477477client_message_append (client ,sizeof (xid_t ),& snap -> xmax );
478478client_message_append (client ,sizeof (xid_t )* snap -> nactive ,snap -> active );