From cc11ba33d90e5a541e8263f7d365d6eeda9d984c Mon Sep 17 00:00:00 2001
From: Hans Goudey <hans@blender.org>
Date: Tue, 26 Dec 2023 09:07:18 -0500
Subject: [PATCH] Cleanup: Use std::queue instead of GSQueue for thread queue

Similar to previous commits.
---
 source/blender/blenlib/intern/threads.cc | 40 +++++++++++-------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/source/blender/blenlib/intern/threads.cc b/source/blender/blenlib/intern/threads.cc
index fc9e3bae149..90284d3cb2d 100644
--- a/source/blender/blenlib/intern/threads.cc
+++ b/source/blender/blenlib/intern/threads.cc
@@ -9,10 +9,10 @@
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
+#include <queue>
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_gsqueue.h"
 #include "BLI_listbase.h"
 #include "BLI_system.h"
 #include "BLI_task.h"
@@ -578,7 +578,7 @@ void BLI_condition_end(ThreadCondition *cond)
 /* ************************************************ */
 
 struct ThreadQueue {
-  GSQueue *queue;
+  std::queue<void *> queue;
   pthread_mutex_t mutex;
   pthread_cond_t push_cond;
   pthread_cond_t finish_cond;
@@ -588,11 +588,7 @@ struct ThreadQueue {
 
 ThreadQueue *BLI_thread_queue_init()
 {
-  ThreadQueue *queue;
-
-  queue = static_cast<ThreadQueue *>(MEM_callocN(sizeof(ThreadQueue), "ThreadQueue"));
-  queue->queue = BLI_gsqueue_new(sizeof(void *));
-
+  ThreadQueue *queue = MEM_new<ThreadQueue>(__func__);
   pthread_mutex_init(&queue->mutex, nullptr);
   pthread_cond_init(&queue->push_cond, nullptr);
   pthread_cond_init(&queue->finish_cond, nullptr);
@@ -607,16 +603,14 @@ void BLI_thread_queue_free(ThreadQueue *queue)
   pthread_cond_destroy(&queue->push_cond);
   pthread_mutex_destroy(&queue->mutex);
 
-  BLI_gsqueue_free(queue->queue);
-
-  MEM_freeN(queue);
+  MEM_delete(queue);
 }
 
 void BLI_thread_queue_push(ThreadQueue *queue, void *work)
 {
   pthread_mutex_lock(&queue->mutex);
 
-  BLI_gsqueue_push(queue->queue, &work);
+  queue->queue.push(work);
 
   /* signal threads waiting to pop */
   pthread_cond_signal(&queue->push_cond);
@@ -629,15 +623,16 @@ void *BLI_thread_queue_pop(ThreadQueue *queue)
 
   /* wait until there is work */
   pthread_mutex_lock(&queue->mutex);
-  while (BLI_gsqueue_is_empty(queue->queue) && !queue->nowait) {
+  while (queue->queue.empty() && !queue->nowait) {
     pthread_cond_wait(&queue->push_cond, &queue->mutex);
   }
 
   /* if we have something, pop it */
-  if (!BLI_gsqueue_is_empty(queue->queue)) {
-    BLI_gsqueue_pop(queue->queue, &work);
+  if (!queue->queue.empty()) {
+    work = queue->queue.front();
+    queue->queue.pop();
 
-    if (BLI_gsqueue_is_empty(queue->queue)) {
+    if (queue->queue.empty()) {
       pthread_cond_broadcast(&queue->finish_cond);
     }
   }
@@ -693,7 +688,7 @@ void *BLI_thread_queue_pop_timeout(ThreadQueue *queue, int ms)
 
   /* wait until there is work */
   pthread_mutex_lock(&queue->mutex);
-  while (BLI_gsqueue_is_empty(queue->queue) && !queue->nowait) {
+  while (queue->queue.empty() && !queue->nowait) {
     if (pthread_cond_timedwait(&queue->push_cond, &queue->mutex, &timeout) == ETIMEDOUT) {
       break;
     }
@@ -703,10 +698,11 @@ void *BLI_thread_queue_pop_timeout(ThreadQueue *queue, int ms)
   }
 
   /* if we have something, pop it */
-  if (!BLI_gsqueue_is_empty(queue->queue)) {
-    BLI_gsqueue_pop(queue->queue, &work);
+  if (!queue->queue.empty()) {
+    work = queue->queue.front();
+    queue->queue.pop();
 
-    if (BLI_gsqueue_is_empty(queue->queue)) {
+    if (queue->queue.empty()) {
       pthread_cond_broadcast(&queue->finish_cond);
     }
   }
@@ -721,7 +717,7 @@ int BLI_thread_queue_len(ThreadQueue *queue)
   int size;
 
   pthread_mutex_lock(&queue->mutex);
-  size = BLI_gsqueue_len(queue->queue);
+  size = queue->queue.size();
   pthread_mutex_unlock(&queue->mutex);
 
   return size;
@@ -732,7 +728,7 @@ bool BLI_thread_queue_is_empty(ThreadQueue *queue)
   bool is_empty;
 
   pthread_mutex_lock(&queue->mutex);
-  is_empty = BLI_gsqueue_is_empty(queue->queue);
+  is_empty = queue->queue.empty();
   pthread_mutex_unlock(&queue->mutex);
 
   return is_empty;
@@ -754,7 +750,7 @@ void BLI_thread_queue_wait_finish(ThreadQueue *queue)
   /* wait for finish condition */
   pthread_mutex_lock(&queue->mutex);
 
-  while (!BLI_gsqueue_is_empty(queue->queue)) {
+  while (!queue->queue.empty()) {
     pthread_cond_wait(&queue->finish_cond, &queue->mutex);
   }