Merge pull request #1216 from hernanponcedeleon/master

Restore original benchmark semantics

Author: dbeyer

c/ldv-races/race-2_2-container_of.c

@@ -45,7 +45,10 @@ void *my_callback(void *arg) {
      data->shared.a = 1;
      __VERIFIER_atomic_end();
      __VERIFIER_atomic_begin();
-     data->shared.b = data->shared.b + 1;
+     int lb = data->shared.b;
+     __VERIFIER_atomic_end();
+     __VERIFIER_atomic_begin();
+     data->shared.b = lb + 1;
      __VERIFIER_atomic_end();
     //pthread_mutex_unlock (&data->lock);
 	return 0;

c/ldv-races/race-2_2-container_of.i

@@ -1693,7 +1693,10 @@ void *my_callback(void *arg) {
      data->shared.a = 1;
      __VERIFIER_atomic_end();
      __VERIFIER_atomic_begin();
-     data->shared.b = data->shared.b + 1;
+     int lb = data->shared.b;
+     __VERIFIER_atomic_end();
+     __VERIFIER_atomic_begin();
+     data->shared.b = lb + 1;
      __VERIFIER_atomic_end();
  return 0;
 }

c/ldv-races/race-2_5-container_of.c

@@ -44,7 +44,10 @@ void *my_callback(void *arg) {
 	data->shared.a = 1;
     __VERIFIER_atomic_end();
     __VERIFIER_atomic_begin();
-	data->shared.b = data->shared.b + 1;
+    int lb = data->shared.b;
+    __VERIFIER_atomic_end();
+    __VERIFIER_atomic_begin();
+    data->shared.b = lb + 1;
     __VERIFIER_atomic_end();
 	pthread_mutex_unlock (&data->lock);
 	return 0;

c/ldv-races/race-2_5-container_of.i

@@ -1694,7 +1694,10 @@ void *my_callback(void *arg) {
  data->shared.a = 1;
     __VERIFIER_atomic_end();
     __VERIFIER_atomic_begin();
- data->shared.b = data->shared.b + 1;
+    int lb = data->shared.b;
+    __VERIFIER_atomic_end();
+    __VERIFIER_atomic_begin();
+    data->shared.b = lb + 1;
     __VERIFIER_atomic_end();
  pthread_mutex_unlock (&data->lock);
  return 0;