sc_atomic_cas replaced with sc_atomic_set

diff --git a/src/cuda-packet-batcher.c b/src/cuda-packet-batcher.c
index 054c0217227c64931c3934a195f02e70520b352e..09a5e8d0c2fe98ab141141fae9892a0427bd5f7a 100644 (file)
--- a/src/cuda-packet-batcher.c
+++ b/src/cuda-packet-batcher.c
@@ -331,7 +331,7 @@ void *SCCudaPBTmThreadsSlot1(void *td)
             TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
             pthread_exit((void *) -1);
         }
-        SC_ATOMIC_CAS(&s->slot_data, SC_ATOMIC_GET(s->slot_data), slot_data);
+        SC_ATOMIC_SET(s->slot_data, slot_data);
     }
     memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
     memset(&s->slot_post_pq, 0, sizeof(PacketQueue));

diff --git a/src/tm-threads.c b/src/tm-threads.c
index 4042c407f7379f9fa20ec2ca690361bda155c555..23b9bb9561af7c0d37016d8fd59840d48bb61f0e 100644 (file)
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -150,7 +150,7 @@ void *TmThreadsSlot1NoIn(void *td)
             TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
             pthread_exit((void *) -1);
         }
-        SC_ATOMIC_CAS(&s->slot_data, SC_ATOMIC_GET(s->slot_data), slot_data);
+        SC_ATOMIC_SET(s->slot_data, slot_data);
     }
     memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
     memset(&s->slot_post_pq, 0, sizeof(PacketQueue));
@@ -248,7 +248,7 @@ void *TmThreadsSlot1NoOut(void *td)
             TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
             pthread_exit((void *) -1);
         }
-        SC_ATOMIC_CAS(&s->slot_data, SC_ATOMIC_GET(s->slot_data), slot_data);
+        SC_ATOMIC_SET(s->slot_data, slot_data);
     }
     memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
     memset(&s->slot_post_pq, 0, sizeof(PacketQueue));
@@ -329,7 +329,7 @@ void *TmThreadsSlot1NoInOut(void *td)
             TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
             pthread_exit((void *) -1);
         }
-        SC_ATOMIC_CAS(&s->slot_data, SC_ATOMIC_GET(s->slot_data), slot_data);
+        SC_ATOMIC_SET(s->slot_data, slot_data);
     }
     memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
     memset(&s->slot_post_pq, 0, sizeof(PacketQueue));
@@ -405,7 +405,7 @@ void *TmThreadsSlot1(void *td)
             TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
             pthread_exit((void *) -1);
         }
-        SC_ATOMIC_CAS(&s->slot_data, SC_ATOMIC_GET(s->slot_data), slot_data);
+        SC_ATOMIC_SET(s->slot_data, slot_data);
     }
     memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
     SCMutexInit(&s->slot_pre_pq.mutex_q, NULL);
@@ -621,7 +621,7 @@ void *TmThreadsSlotPktAcqLoop(void *td) {
                 TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
                 pthread_exit((void *) -1);
             }
-            SC_ATOMIC_CAS(&slot->slot_data, SC_ATOMIC_GET(slot->slot_data), slot_data);
+            SC_ATOMIC_SET(slot->slot_data, slot_data);
         }
         memset(&slot->slot_pre_pq, 0, sizeof(PacketQueue));
         SCMutexInit(&slot->slot_pre_pq.mutex_q, NULL);
@@ -709,7 +709,7 @@ void *TmThreadsSlotVar(void *td)
                 TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
                 pthread_exit((void *) -1);
             }
-            SC_ATOMIC_CAS(&s->slot_data, SC_ATOMIC_GET(s->slot_data), slot_data);
+            SC_ATOMIC_SET(s->slot_data, slot_data);
         }
         memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
         SCMutexInit(&s->slot_pre_pq.mutex_q, NULL);

diff --git a/src/util-atomic.c b/src/util-atomic.c
index c79f126e296e8792b4d56b8f7149deb2d570a9c6..139c68b047999f45574657d55d12c75899bedd3e 100644 (file)
--- a/src/util-atomic.c
+++ b/src/util-atomic.c
@@ -41,14 +41,14 @@ static int SCAtomicTest01(void)
     if (temp_int != NULL)
         goto end;
 
-    SC_ATOMIC_CAS(&temp, SC_ATOMIC_GET(temp), &a);
+    SC_ATOMIC_SET(temp, &a);
     temp_int = SC_ATOMIC_GET(temp);
     if (temp_int == NULL)
         goto end;
     if (*temp_int != a)
         goto end;
 
-    SC_ATOMIC_CAS(&temp, SC_ATOMIC_GET(temp), &b);
+    SC_ATOMIC_SET(temp, &b);
     temp_int = SC_ATOMIC_GET(temp);
     if (temp_int == NULL)
         goto end;

diff --git a/src/util-mpm-b2g-cuda.c b/src/util-mpm-b2g-cuda.c
index 15a944a2139206421d0c64eba824ff56574bd076..95881ff77d3dd3b8d330b2e14cfcf17f0f5b6d14 100644 (file)
--- a/src/util-mpm-b2g-cuda.c
+++ b/src/util-mpm-b2g-cuda.c
@@ -2245,7 +2245,7 @@ void *CudaMpmB2gThreadsSlot1(void *td)
             TmThreadsSetFlag(tv, THV_CLOSED | THV_RUNNING_DONE);
             pthread_exit((void *) -1);
         }
-        SC_ATOMIC_CAS(&s->slot_data, SC_ATOMIC_GET(s->slot_data), slot_data);
+        SC_ATOMIC_SET(s->slot_data, slot_data);
     }
     memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
     memset(&s->slot_post_pq, 0, sizeof(PacketQueue));