GeezerVison

Original file line number	Diff line number	Diff line change
Expand Up		@@ -80,7 +80,7 @@ struct _xid;

		// _PyCrossInterpreterData is similar to Py_buffer as an effectively
		// opaque struct that holds data outside the object machinery. This
		// is necessary to pass between interpreters in the same process.
		// is necessary to pass safely between interpreters in the same process.
		typedef struct _xid {
		// data is the cross-interpreter-safe derivation of a Python object
		// (see _PyObject_GetCrossInterpreterData). It will be NULL if the
Expand All		@@ -89,8 +89,9 @@ typedef struct _xid {
		// obj is the Python object from which the data was derived. This
		// is non-NULL only if the data remains bound to the object in some
		// way, such that the object must be "released" (via a decref) when
		// the data is released. In that case it is automatically
		// incref'ed (to match the automatic decref when releaed).
		// the data is released. In that case the code that sets the field,
		// likely a registered "crossinterpdatafunc", is responsible for
		// ensuring it owns the reference (i.e. incref).
		PyObject *obj;
		// interp is the ID of the owning interpreter of the original
		// object. It corresponds to the active interpreter when
Expand Down

2 changes: 0 additions & 2 deletions 2 Lib/test/test__xxsubinterpreters.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -1315,8 +1315,6 @@ def test_run_string_arg_unresolved(self):
		self.assertEqual(obj, b'spam')
		self.assertEqual(out.strip(), 'send')

		# XXX Fix the crashes.
		@unittest.skip('bpo-33615: triggering crashes so temporarily disabled')
		def test_run_string_arg_resolved(self):
		cid = interpreters.channel_create()
		cid = interpreters._channel_id(cid, _resolve=True)
Expand Down

1 change: 1 addition & 0 deletions 1 Modules/_xxsubinterpretersmodule.c

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -1712,6 +1712,7 @@ _channelid_shared(PyObject obj, _PyCrossInterpreterData data)
		xid->resolve = ((channelid *)obj)->resolve;

		data->data = xid;
		Py_INCREF(obj);
		data->obj = obj;
		data->new_object = _channelid_from_xid;
		data->free = PyMem_Free;
Expand Down

55 changes: 37 additions & 18 deletions 55 Python/pystate.c

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -1205,7 +1205,6 @@ _PyObject_GetCrossInterpreterData(PyObject obj, _PyCrossInterpreterData data)
		}

		// Fill in the blanks and validate the result.
		Py_XINCREF(data->obj);
		data->interp = interp->id;
		if (_check_xidata(data) != 0) {
		_PyCrossInterpreterData_Release(data);
Expand All		@@ -1215,6 +1214,40 @@ _PyObject_GetCrossInterpreterData(PyObject obj, _PyCrossInterpreterData data)
		return 0;
		}

		static void
		_release_xidata(void *arg)
		{
		_PyCrossInterpreterData data = (_PyCrossInterpreterData )arg;
		if (data->free != NULL) {
		data->free(data->data);
		}
		Py_XDECREF(data->obj);
		}

		static void
		_call_in_interpreter(PyInterpreterState *interp,
		void (func)(void ), void *arg)
		{
		/* We would use Py_AddPendingCall() if it weren't specific to the
		* main interpreter (see bpo-33608). In the meantime we take a
		* naive approach.
		*/
		PyThreadState *save_tstate = NULL;
		if (interp != PyThreadState_Get()->interp) {
		// XXX Using the "head" thread isn't strictly correct.
		PyThreadState *tstate = PyInterpreterState_ThreadHead(interp);
		// XXX Possible GILState issues?
		save_tstate = PyThreadState_Swap(tstate);
		}

		func(arg);

		// Switch back.
		if (save_tstate != NULL) {
		PyThreadState_Swap(save_tstate);
		}
		}

		void
		_PyCrossInterpreterData_Release(_PyCrossInterpreterData *data)
		{
Expand All		@@ -1233,24 +1266,8 @@ _PyCrossInterpreterData_Release(_PyCrossInterpreterData *data)
		return;
		}

		PyThreadState *save_tstate = NULL;
		if (interp != PyThreadState_Get()->interp) {
		// XXX Using the "head" thread isn't strictly correct.
		PyThreadState *tstate = PyInterpreterState_ThreadHead(interp);
		// XXX Possible GILState issues?
		save_tstate = PyThreadState_Swap(tstate);
		}

		// "Release" the data and/or the object.
		if (data->free != NULL) {
		data->free(data->data);
		}
		Py_XDECREF(data->obj);

		// Switch back.
		if (save_tstate != NULL) {
		PyThreadState_Swap(save_tstate);
		}
		_call_in_interpreter(interp, _release_xidata, data);
		}

		PyObject *
Expand Down Expand Up		@@ -1355,6 +1372,7 @@ _bytes_shared(PyObject obj, _PyCrossInterpreterData data)
		return -1;
		}
		data->data = (void *)shared;
		Py_INCREF(obj);
		data->obj = obj; // Will be "released" (decref'ed) when data released.
		data->new_object = _new_bytes_object;
		data->free = PyMem_Free;
Expand Down Expand Up		@@ -1382,6 +1400,7 @@ _str_shared(PyObject obj, _PyCrossInterpreterData data)
		shared->buffer = PyUnicode_DATA(obj);
		shared->len = PyUnicode_GET_LENGTH(obj) - 1;
		data->data = (void *)shared;
		Py_INCREF(obj);
		data->obj = obj; // Will be "released" (decref'ed) when data released.
		data->new_object = _new_str_object;
		data->free = PyMem_Free;
Expand Down

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.