implement __sizeof__ for SimpleQueue to account for ring-buffer storage

Author: Aniketsy

Lib/test/test_queue.py

@@ -2,14 +2,14 @@
 # to ensure the Queue locks remain stable.
 import itertools
 import random
+import struct
 import threading
 import time
 import unittest
 import weakref
 from test.support import gc_collect, bigmemtest
 from test.support import import_helper
 from test.support import threading_helper
-import sys
 from test import support
 
 # queue module depends on threading primitives

Modules/_queuemodule.c

@@ -239,22 +239,6 @@ simplequeue_traverse(PyObject *op, visitproc visit, void *arg)
     return 0;
 }
 
-/*[clinic input]
-@critical_section
-_queue.SimpleQueue.__sizeof__ -> Py_ssize_t
-
-Returns size in memory, in bytes.
-[clinic start generated code]*/
-
-static Py_ssize_t
-_queue_SimpleQueue___sizeof___impl(simplequeueobject *self)
-/*[clinic end generated code: output=58ce4e3bbc078fd4 input=a3a7f05c9616598f]*/
-{
-    Py_ssize_t res = sizeof(simplequeueobject);
-    res += self->buf.items_cap * sizeof(PyObject *);
-    return res;
-}
-
 /*[clinic input]
 @classmethod
 _queue.SimpleQueue.__new__ as simplequeue_new
@@ -516,6 +500,22 @@ _queue_SimpleQueue_qsize_impl(simplequeueobject *self)
     return RingBuf_Len(&self->buf);
 }
 
+/*[clinic input]
+@critical_section
+_queue.SimpleQueue.__sizeof__ -> Py_ssize_t
+
+Returns size in memory, in bytes.
+[clinic start generated code]*/
+
+static Py_ssize_t
+_queue_SimpleQueue___sizeof___impl(simplequeueobject *self)
+/*[clinic end generated code: output=58ce4e3bbc078fd4 input=a3a7f05c9616598f]*/
+{
+    Py_ssize_t res = sizeof(simplequeueobject);
+    res += self->buf.items_cap * sizeof(PyObject *);
+    return res;
+}
+
 static int
 queue_traverse(PyObject *m, visitproc visit, void *arg)
 {