bool add_pred(FuncInst * other);
bool add_succ(FuncInst * other);
- //FuncInst * search_in_collision(ModelAction *act);
- //func_inst_list_mt * get_collisions() { return &collisions; }
+ FuncInst * search_in_collision(ModelAction *act);
+ void add_to_collision(FuncInst * inst);
func_inst_list_mt * get_preds() { return &predecessors; }
func_inst_list_mt * get_succs() { return &successors; }
const char * position;
/* Atomic operations with the same source line number may act at different
- * memory locations, such as the next field of the head pointer in ms-queue.
+ * memory locations, such as the next field of the head pointer in ms-queue.
* location only stores the memory location when this FuncInst was constructed.
*/
void * location;
int execution_number;
ModelAction * associated_act;
- uint32_t marker;
-
- /* Currently not in use. May remove this field later
- *
- * collisions store a list of FuncInsts with the same position
- * but different action types. For example, CAS is broken down
- * as three different atomic operations in cmodelint.cc */
- // func_inst_list_mt collisions;
+ uint32_t action_marker;
+
+ /**
+ * Collisions store a list of FuncInsts with the same position
+ * but different action types. For example,
+ * <code>volatile int x; x++;</code> produces read and write
+ * actions with the same position.
+ */
+ func_inst_list_mt collisions;
func_inst_list_mt predecessors;
func_inst_list_mt successors;