43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
--- a/libitm/beginend.cc
|
|
+++ b/libitm/beginend.cc
|
|
@@ -431,7 +431,7 @@ GTM::gtm_transaction_cp::save(gtm_thread
|
|
// Save everything that we might have to restore on restarts or aborts.
|
|
jb = tx->jb;
|
|
undolog_size = tx->undolog.size();
|
|
- memcpy(&alloc_actions, &tx->alloc_actions, sizeof(alloc_actions));
|
|
+ alloc_actions = tx->alloc_actions;
|
|
user_actions_size = tx->user_actions.size();
|
|
id = tx->id;
|
|
prop = tx->prop;
|
|
@@ -449,7 +449,7 @@ GTM::gtm_transaction_cp::commit(gtm_thre
|
|
// commits of nested transactions. Allocation actions must be committed
|
|
// before committing the snapshot.
|
|
tx->jb = jb;
|
|
- memcpy(&tx->alloc_actions, &alloc_actions, sizeof(alloc_actions));
|
|
+ tx->alloc_actions = alloc_actions;
|
|
tx->id = id;
|
|
tx->prop = prop;
|
|
}
|
|
@@ -485,7 +485,7 @@ GTM::gtm_thread::rollback (gtm_transacti
|
|
prop = cp->prop;
|
|
if (cp->disp != abi_disp())
|
|
set_abi_disp(cp->disp);
|
|
- memcpy(&alloc_actions, &cp->alloc_actions, sizeof(alloc_actions));
|
|
+ alloc_actions = cp->alloc_actions;
|
|
nesting = cp->nesting;
|
|
}
|
|
else
|
|
--- a/libitm/method-ml.cc
|
|
+++ b/libitm/method-ml.cc
|
|
@@ -138,7 +138,9 @@ struct ml_mg : public method_group
|
|
// This store is only executed while holding the serial lock, so relaxed
|
|
// memory order is sufficient here. Same holds for the memset.
|
|
time.store(0, memory_order_relaxed);
|
|
- memset(orecs, 0, sizeof(atomic<gtm_word>) * L2O_ORECS);
|
|
+ void *p = orecs;
|
|
+ memset(p, 0, sizeof(atomic<gtm_word>) * L2O_ORECS);
|
|
+
|
|
}
|
|
};
|
|
|