From: weiyu <weiyuluo1232@gmail.com>
Date: Mon, 1 Jul 2019 18:47:38 +0000 (-0700)
Subject: fix git conflict
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=a1280c133564afec30de10cc1de12a23b02a13d0

fix git conflict
---

a1280c133564afec30de10cc1de12a23b02a13d0
diff --cc Makefile
index fcebbf36,0d2af464..214873ac
--- a/Makefile
+++ b/Makefile
@@@ -5,7 -5,7 +5,7 @@@ OBJECTS := libthreads.o schedule.o mode
  	   datarace.o impatomic.o cmodelint.o \
  	   snapshot.o malloc.o mymemory.o common.o mutex.o conditionvariable.o \
  	   context.o execution.o libannotate.o plugins.o pthread.o futex.o fuzzer.o \
- 	   sleeps.o history.o funcnode.o
 -	   sleeps.o history.o printf.o
++	   sleeps.o history.o funcnode.o printf.o
  
  CPPFLAGS += -Iinclude -I.
  LDFLAGS := -ldl -lrt -rdynamic
@@@ -34,10 -34,10 +34,10 @@@ README.html: README.m
  	$(MARKDOWN) $< > $@
  
  malloc.o: malloc.c
- 	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
+ 	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=1 $(CPPFLAGS) -Wno-unused-variable
  
 -futex.o: futex.cc
 -	$(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS)
 +#futex.o: futex.cc
 +#	$(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS)
  
  %.o : %.cc
  	$(CXX) -MMD -MF .$@.d -fPIC -c $< $(CPPFLAGS)
diff --cc execution.h
index 9487fd6e,fa2b78b8..0a36d31c
--- a/execution.h
+++ b/execution.h
@@@ -103,11 -103,10 +103,12 @@@ public
  	action_list_t * get_action_trace() { return &action_trace; }
  	Fuzzer * getFuzzer();
  	CycleGraph * const get_mo_graph() { return mo_graph; }
- 	HashTable<pthread_cond_t *, cdsc::condition_variable *, uintptr_t, 4> * getCondMap() {return &cond_map;}
- 	HashTable<pthread_mutex_t *, cdsc::mutex *, uintptr_t, 4> * getMutexMap() {return &mutex_map;}
+ 	HashTable<pthread_cond_t *, cdsc::snapcondition_variable *, uintptr_t, 4> * getCondMap() {return &cond_map;}
+ 	HashTable<pthread_mutex_t *, cdsc::snapmutex *, uintptr_t, 4> * getMutexMap() {return &mutex_map;}
+ 	ModelAction * check_current_action(ModelAction *curr);
  
 +	SnapVector<func_id_list_t *> * get_thrd_func_list() { return &thrd_func_list; }
 +
  	SNAPSHOTALLOC
  private:
  	int get_execution_number() const;