diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtm/main/gtm_snap.c | 4 | ||||
| -rw-r--r-- | src/gtm/main/gtm_thread.c | 5 | ||||
| -rw-r--r-- | src/include/gtm/gtm.h | 7 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/gtm/main/gtm_snap.c b/src/gtm/main/gtm_snap.c index 5a538985df..f8e3d31976 100644 --- a/src/gtm/main/gtm_snap.c +++ b/src/gtm/main/gtm_snap.c @@ -103,6 +103,10 @@ GTM_GetTransactionSnapshot(GTM_TransactionHandle handle[], int txn_count, int *s Assert(snapshot != NULL); + /* + * This can only happen when using a snapshot from GTMTransactions, as the + * thread-specific sn_xip array is allocated statically as part of GTM_ThreadInfo. + */ if (snapshot->sn_xip == NULL) { /* diff --git a/src/gtm/main/gtm_thread.c b/src/gtm/main/gtm_thread.c index c513f6a71f..9d166f4a0e 100644 --- a/src/gtm/main/gtm_thread.c +++ b/src/gtm/main/gtm_thread.c @@ -256,6 +256,11 @@ GTM_ThreadCreate(GTM_ConnectionInfo *conninfo, 8 * 1024, false); + /* + * Set the sn_xip pointer to the statically-allocated array (see GTM_ThreadInfo). + */ + thrinfo->thr_snapshot.sn_xip = thrinfo->thr_xip; + thrinfo->thr_startroutine = startroutine; /* diff --git a/src/include/gtm/gtm.h b/src/include/gtm/gtm.h index 37d31f6ba4..7b494fb6a2 100644 --- a/src/include/gtm/gtm.h +++ b/src/include/gtm/gtm.h @@ -59,6 +59,13 @@ typedef struct GTM_ThreadInfo GTM_RWLock thr_lock; gtm_List *thr_cached_txninfo; GTM_SnapshotData thr_snapshot; + + /* + * Statically allocated XID array for the snapshot. Every thread will need + * a snapshot anyway, and this way we don't have to worry about allocation + * and freeing of the memory at thread exit. + */ + GlobalTransactionId thr_xip[GTM_MAX_GLOBAL_TRANSACTIONS]; } GTM_ThreadInfo; typedef struct GTM_Threads |