Add support for int.

python · ericsnowcurrently · May 16, 2018 · Feb 20, 2018 · Feb 20, 2018 · Mar 14, 2018
commit 49e80652bf1cf604b8b589823de91109b61f28a5
diff --git a/Lib/test/test__xxsubinterpreters.py b/Lib/test/test__xxsubinterpreters.py
@@ -83,6 +83,8 @@ def test_default_shareables(self):
                 None,
                 # builtin objects
                 b'spam',
+                10,
+                -10,
                 ]
         for obj in shareables:
             with self.subTest(obj):
@@ -110,7 +112,6 @@ class SubBytes(bytes):
                 object,
                 object(),
                 Exception(),
-                42,
                 100.0,
                 'spam',
                 # user-defined types and objects
@@ -124,6 +125,47 @@ class SubBytes(bytes):
                     interpreters.is_shareable(obj))
 
 
+class ShareableTypeTests(unittest.TestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.cid = interpreters.channel_create()
+
+    def tearDown(self):
+        interpreters.channel_destroy(self.cid)
+        super().tearDown()
+
+    def _assert_values(self, values):
+        for obj in values:
+            with self.subTest(obj):
+                interpreters.channel_send(self.cid, obj)
+                got = interpreters.channel_recv(self.cid)
+
+                self.assertEqual(got, obj)
+                self.assertIs(type(got), type(obj))
+                # XXX Check the following in the channel tests?
+                #self.assertIsNot(got, obj)
+
+    def test_singletons(self):
+        for obj in [None]:
+            with self.subTest(obj):
+                interpreters.channel_send(self.cid, obj)
+                got = interpreters.channel_recv(self.cid)
+
+                # XXX What about between interpreters?
+                self.assertIs(got, obj)
+
+    def test_types(self):
+        self._assert_values([
+            b'spam',
+            9999,
+            self.cid,
+            ])
+
+    def test_int(self):
+        self._assert_values(range(-1, 258))
+
+
 ##################################
 # interpreter tests
 

diff --git a/Python/pystate.c b/Python/pystate.c
@@ -1348,6 +1348,29 @@ _bytes_shared(PyObject *obj, _PyCrossInterpreterData *data)
     return 0;
 }
 
+static PyObject *
+_new_long_object(_PyCrossInterpreterData *data)
+{
+    return PyLong_FromLongLong((int64_t)(data->data));
+}
+
+static int
+_long_shared(PyObject *obj, _PyCrossInterpreterData *data)
+{
+    int64_t value = PyLong_AsLongLong(obj);
+    if (value == -1 && PyErr_Occurred()) {
+        if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
+            PyErr_SetString(PyExc_OverflowError, "try sending as bytes");
+        }
+        return -1;
+    }
+    data->data = (void *)value;
+    data->obj = NULL;
+    data->new_object = _new_long_object;
+    data->free = NULL;
+    return 0;
+}
+
 static PyObject *
 _new_none_object(_PyCrossInterpreterData *data)
 {
@@ -1374,6 +1397,11 @@ _register_builtins_for_crossinterpreter_data(void)
         Py_FatalError("could not register None for cross-interpreter sharing");
     }
 
+    // int
+    if (_register_xidata(&PyLong_Type, _long_shared) != 0) {
+        Py_FatalError("could not register int for cross-interpreter sharing");
+    }
+
     // bytes
     if (_register_xidata(&PyBytes_Type, _bytes_shared) != 0) {
         Py_FatalError("could not register bytes for cross-interpreter sharing");