Context Navigation

Changeset 1144Tweet

Timestamp:

Feb 25, 2012, 2:38:42 PM (9 years ago)

Author:

sam

Message:

threads: change Queue to a template so that we can manage the element type.

Location:

trunk

Files:

-                      r1098
+                      r1144
 };
+class Queue : public QueueBase
+template<typename T, int N = 128> class Queue : public QueueBase<T, N>
+{
 public:
     Queue() : QueueBase() {}
+    Queue() : QueueBase<T, N>() {}
 };

-                      r1109
+                      r1144
 };
 class QueueBase
+template<typename T, int N> class QueueBase
+{
 public:
 …
+    }
     void Push(int value)
+    void Push(T value)
+    {
 #if defined HAVE_PTHREAD_H
 …
+    }
     int Pop()
+    T Pop()
+    {
 #if defined HAVE_PTHREAD_H
 …
         /* Pop value */
         int ret = m_values[m_start];
+        T ret = m_values[m_start];
         m_start = (m_start + 1) % CAPACITY;
         m_count--;
 …
 private:
     static size_t const CAPACITY = 100;
     int m_values[CAPACITY];
+    static size_t const CAPACITY = N;
+    T m_values[CAPACITY];
     size_t m_start, m_count;
 #if defined HAVE_PTHREAD_H

r1125	r1144
76	76	static void DiskThreadMain(void p);
77	77	Thread gamethread, drawthread, *diskthread;
78		Queue gametick, drawtick;
	78	Queue<int> gametick, drawtick;
79	79
80	80	/* Shutdown management */

r1136	r1144
770	770	/* Worker threads */
771	771	Thread *m_threads[MAX_THREADS];
772		Queue m_spawnqueue, m_jobqueue, m_donequeue;
	772	Queue<int> m_spawnqueue, m_jobqueue, m_donequeue;
773	773
774	774	/* Debug information */

Note: See TracChangeset for help on using the changeset viewer.