f97cf54db7
This updates Pybind11 from version 2.2.1 to version 2.4.1. This fixes
warning/error received when "<experiment/optional>" is used when
compiling using c++14 with clang. It should be noted that
"ext/pybind11/include/pybind11/std.h" has been changed to include a fix
added by commit ba42457254. This is
necessary to avoid build errors.
Built: Linux (gcc, c++11) and MacOS (clang, c++14).
Tested: Ran quick tests for X86, ARM, and RISC-V.
Deprecates: https://gem5-review.googlesource.com/c/public/gem5/+/21019
Change-Id: Ie9783511cb6be50136076a55330e645f4f36d075
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21119
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
74 lines
1.8 KiB
C++
74 lines
1.8 KiB
C++
/*
|
|
tests/cross_module_gil_utils.cpp -- tools for acquiring GIL from a different module
|
|
|
|
Copyright (c) 2019 Google LLC
|
|
|
|
All rights reserved. Use of this source code is governed by a
|
|
BSD-style license that can be found in the LICENSE file.
|
|
*/
|
|
#include <pybind11/pybind11.h>
|
|
#include <cstdint>
|
|
|
|
// This file mimics a DSO that makes pybind11 calls but does not define a
|
|
// PYBIND11_MODULE. The purpose is to test that such a DSO can create a
|
|
// py::gil_scoped_acquire when the running thread is in a GIL-released state.
|
|
//
|
|
// Note that we define a Python module here for convenience, but in general
|
|
// this need not be the case. The typical scenario would be a DSO that implements
|
|
// shared logic used internally by multiple pybind11 modules.
|
|
|
|
namespace {
|
|
|
|
namespace py = pybind11;
|
|
void gil_acquire() { py::gil_scoped_acquire gil; }
|
|
|
|
constexpr char kModuleName[] = "cross_module_gil_utils";
|
|
|
|
#if PY_MAJOR_VERSION >= 3
|
|
struct PyModuleDef moduledef = {
|
|
PyModuleDef_HEAD_INIT,
|
|
kModuleName,
|
|
NULL,
|
|
0,
|
|
NULL,
|
|
NULL,
|
|
NULL,
|
|
NULL,
|
|
NULL
|
|
};
|
|
#else
|
|
PyMethodDef module_methods[] = {
|
|
{NULL, NULL, 0, NULL}
|
|
};
|
|
#endif
|
|
|
|
} // namespace
|
|
|
|
extern "C" PYBIND11_EXPORT
|
|
#if PY_MAJOR_VERSION >= 3
|
|
PyObject* PyInit_cross_module_gil_utils()
|
|
#else
|
|
void initcross_module_gil_utils()
|
|
#endif
|
|
{
|
|
|
|
PyObject* m =
|
|
#if PY_MAJOR_VERSION >= 3
|
|
PyModule_Create(&moduledef);
|
|
#else
|
|
Py_InitModule(kModuleName, module_methods);
|
|
#endif
|
|
|
|
if (m != NULL) {
|
|
static_assert(
|
|
sizeof(&gil_acquire) == sizeof(void*),
|
|
"Function pointer must have the same size as void*");
|
|
PyModule_AddObject(m, "gil_acquire_funcaddr",
|
|
PyLong_FromVoidPtr(reinterpret_cast<void*>(&gil_acquire)));
|
|
}
|
|
|
|
#if PY_MAJOR_VERSION >= 3
|
|
return m;
|
|
#endif
|
|
}
|