2015-07-05 18:05:44 +00:00
|
|
|
/*
|
Rename examples files, as per #288
This renames example files from `exampleN` to `example-description`.
Specifically, the following renaming is applied:
example1 -> example-methods-and-attributes
example2 -> example-python-types
example3 -> example-operator-overloading
example4 -> example-constants-and-functions
example5 -> example-callbacks (*)
example6 -> example-sequence-and-iterators
example7 -> example-buffers
example8 -> example-custom-ref-counting
example9 -> example-modules
example10 -> example-numpy-vectorize
example11 -> example-arg-keywords-and-defaults
example12 -> example-virtual-functions
example13 -> example-keep-alive
example14 -> example-opaque-types
example15 -> example-pickling
example16 -> example-inheritance
example17 -> example-stl-binders
example18 -> example-eval
example19 -> example-custom-exceptions
* the inheritance parts of example5 are moved into example-inheritance
(previously example16), and the remainder is left as example-callbacks.
This commit also renames the internal variables ("Example1",
"Example2", "Example4", etc.) into non-numeric names ("ExampleMandA",
"ExamplePythonTypes", "ExampleWithEnum", etc.) to correspond to the
file renaming.
The order of tests is preserved, but this can easily be changed if
there is some more natural ordering by updating the list in
examples/CMakeLists.txt.
2016-07-18 20:43:18 +00:00
|
|
|
example/example-callbacks.cpp -- callbacks
|
2015-07-05 18:05:44 +00:00
|
|
|
|
2016-04-17 18:21:41 +00:00
|
|
|
Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
|
2015-07-05 18:05:44 +00:00
|
|
|
|
|
|
|
All rights reserved. Use of this source code is governed by a
|
|
|
|
BSD-style license that can be found in the LICENSE file.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "example.h"
|
Improve constructor/destructor tracking
This commit rewrites the examples that look for constructor/destructor
calls to do so via static variable tracking rather than output parsing.
The added ConstructorStats class provides methods to keep track of
constructors and destructors, number of default/copy/move constructors,
and number of copy/move assignments. It also provides a mechanism for
storing values (e.g. for value construction), and then allows all of
this to be checked at the end of a test by getting the statistics for a
C++ (or python mapping) class.
By not relying on the precise pattern of constructions/destructions,
but rather simply ensuring that every construction is matched with a
destruction on the same object, we ensure that everything that gets
created also gets destroyed as expected.
This replaces all of the various "std::cout << whatever" code in
constructors/destructors with
`print_created(this)`/`print_destroyed(this)`/etc. functions which
provide similar output, but now has a unified format across the
different examples, including a new ### prefix that makes mixed example
output and lifecycle events easier to distinguish.
With this change, relaxed mode is no longer needed, which enables
testing for proper destruction under MSVC, and under any other compiler
that generates code calling extra constructors, or optimizes away any
constructors. GCC/clang are used as the baseline for move
constructors; the tests are adapted to allow more move constructors to
be evoked (but other types are constructors much have matching counts).
This commit also disables output buffering of tests, as the buffering
sometimes results in C++ output ending up in the middle of python
output (or vice versa), depending on the OS/python version.
2016-08-07 17:05:26 +00:00
|
|
|
#include "constructor-stats.h"
|
2015-10-15 16:13:33 +00:00
|
|
|
#include <pybind11/functional.h>
|
2015-07-05 18:05:44 +00:00
|
|
|
|
|
|
|
|
|
|
|
bool test_callback1(py::object func) {
|
2016-05-08 12:34:09 +00:00
|
|
|
func();
|
2015-07-05 18:05:44 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
int test_callback2(py::object func) {
|
2016-05-08 12:34:09 +00:00
|
|
|
py::object result = func("Hello", 'x', true, 5);
|
2015-07-05 18:05:44 +00:00
|
|
|
return result.cast<int>();
|
|
|
|
}
|
|
|
|
|
2015-10-01 14:46:03 +00:00
|
|
|
void test_callback3(const std::function<int(int)> &func) {
|
2015-07-30 13:29:00 +00:00
|
|
|
cout << "func(43) = " << func(43)<< std::endl;
|
|
|
|
}
|
|
|
|
|
2015-10-01 14:46:03 +00:00
|
|
|
std::function<int(int)> test_callback4() {
|
2015-07-30 13:29:00 +00:00
|
|
|
return [](int i) { return i+1; };
|
|
|
|
}
|
|
|
|
|
2016-06-16 18:19:15 +00:00
|
|
|
py::cpp_function test_callback5() {
|
|
|
|
return py::cpp_function([](int i) { return i+1; },
|
|
|
|
py::arg("number"));
|
|
|
|
}
|
|
|
|
|
2016-07-10 08:13:18 +00:00
|
|
|
int dummy_function(int i) { return i + 1; }
|
|
|
|
int dummy_function2(int i, int j) { return i + j; }
|
|
|
|
std::function<int(int)> roundtrip(std::function<int(int)> f) {
|
|
|
|
std::cout << "roundtrip.." << std::endl;
|
|
|
|
return f;
|
|
|
|
}
|
|
|
|
|
|
|
|
void test_dummy_function(const std::function<int(int)> &f) {
|
|
|
|
using fn_type = int (*)(int);
|
|
|
|
auto result = f.target<fn_type>();
|
|
|
|
if (!result) {
|
|
|
|
std::cout << "could not convert to a function pointer." << std::endl;
|
|
|
|
auto r = f(1);
|
|
|
|
std::cout << "eval(1) = " << r << std::endl;
|
|
|
|
} else if (*result == dummy_function) {
|
|
|
|
std::cout << "argument matches dummy_function" << std::endl;
|
|
|
|
auto r = (*result)(1);
|
|
|
|
std::cout << "eval(1) = " << r << std::endl;
|
|
|
|
} else {
|
|
|
|
std::cout << "argument does NOT match dummy_function. This should never happen!" << std::endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Improve constructor/destructor tracking
This commit rewrites the examples that look for constructor/destructor
calls to do so via static variable tracking rather than output parsing.
The added ConstructorStats class provides methods to keep track of
constructors and destructors, number of default/copy/move constructors,
and number of copy/move assignments. It also provides a mechanism for
storing values (e.g. for value construction), and then allows all of
this to be checked at the end of a test by getting the statistics for a
C++ (or python mapping) class.
By not relying on the precise pattern of constructions/destructions,
but rather simply ensuring that every construction is matched with a
destruction on the same object, we ensure that everything that gets
created also gets destroyed as expected.
This replaces all of the various "std::cout << whatever" code in
constructors/destructors with
`print_created(this)`/`print_destroyed(this)`/etc. functions which
provide similar output, but now has a unified format across the
different examples, including a new ### prefix that makes mixed example
output and lifecycle events easier to distinguish.
With this change, relaxed mode is no longer needed, which enables
testing for proper destruction under MSVC, and under any other compiler
that generates code calling extra constructors, or optimizes away any
constructors. GCC/clang are used as the baseline for move
constructors; the tests are adapted to allow more move constructors to
be evoked (but other types are constructors much have matching counts).
This commit also disables output buffering of tests, as the buffering
sometimes results in C++ output ending up in the middle of python
output (or vice versa), depending on the OS/python version.
2016-08-07 17:05:26 +00:00
|
|
|
struct Payload {
|
|
|
|
Payload() {
|
|
|
|
print_default_created(this);
|
|
|
|
}
|
|
|
|
~Payload() {
|
|
|
|
print_destroyed(this);
|
|
|
|
}
|
|
|
|
Payload(const Payload &) {
|
|
|
|
print_copy_created(this);
|
|
|
|
}
|
|
|
|
Payload(Payload &&) {
|
|
|
|
print_move_created(this);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
Rename examples files, as per #288
This renames example files from `exampleN` to `example-description`.
Specifically, the following renaming is applied:
example1 -> example-methods-and-attributes
example2 -> example-python-types
example3 -> example-operator-overloading
example4 -> example-constants-and-functions
example5 -> example-callbacks (*)
example6 -> example-sequence-and-iterators
example7 -> example-buffers
example8 -> example-custom-ref-counting
example9 -> example-modules
example10 -> example-numpy-vectorize
example11 -> example-arg-keywords-and-defaults
example12 -> example-virtual-functions
example13 -> example-keep-alive
example14 -> example-opaque-types
example15 -> example-pickling
example16 -> example-inheritance
example17 -> example-stl-binders
example18 -> example-eval
example19 -> example-custom-exceptions
* the inheritance parts of example5 are moved into example-inheritance
(previously example16), and the remainder is left as example-callbacks.
This commit also renames the internal variables ("Example1",
"Example2", "Example4", etc.) into non-numeric names ("ExampleMandA",
"ExamplePythonTypes", "ExampleWithEnum", etc.) to correspond to the
file renaming.
The order of tests is preserved, but this can easily be changed if
there is some more natural ordering by updating the list in
examples/CMakeLists.txt.
2016-07-18 20:43:18 +00:00
|
|
|
void init_ex_callbacks(py::module &m) {
|
2015-07-05 18:05:44 +00:00
|
|
|
m.def("test_callback1", &test_callback1);
|
|
|
|
m.def("test_callback2", &test_callback2);
|
|
|
|
m.def("test_callback3", &test_callback3);
|
2015-07-30 13:29:00 +00:00
|
|
|
m.def("test_callback4", &test_callback4);
|
2016-06-16 18:19:15 +00:00
|
|
|
m.def("test_callback5", &test_callback5);
|
2015-10-13 15:37:25 +00:00
|
|
|
|
|
|
|
/* Test cleanup of lambda closure */
|
|
|
|
|
|
|
|
m.def("test_cleanup", []() -> std::function<void(void)> {
|
|
|
|
Payload p;
|
|
|
|
|
|
|
|
return [p]() {
|
|
|
|
/* p should be cleaned up when the returned function is garbage collected */
|
|
|
|
};
|
|
|
|
});
|
2016-07-10 08:13:18 +00:00
|
|
|
|
|
|
|
/* Test if passing a function pointer from C++ -> Python -> C++ yields the original pointer */
|
|
|
|
m.def("dummy_function", &dummy_function);
|
|
|
|
m.def("dummy_function2", &dummy_function2);
|
|
|
|
m.def("roundtrip", &roundtrip);
|
|
|
|
m.def("test_dummy_function", &test_dummy_function);
|
Improve constructor/destructor tracking
This commit rewrites the examples that look for constructor/destructor
calls to do so via static variable tracking rather than output parsing.
The added ConstructorStats class provides methods to keep track of
constructors and destructors, number of default/copy/move constructors,
and number of copy/move assignments. It also provides a mechanism for
storing values (e.g. for value construction), and then allows all of
this to be checked at the end of a test by getting the statistics for a
C++ (or python mapping) class.
By not relying on the precise pattern of constructions/destructions,
but rather simply ensuring that every construction is matched with a
destruction on the same object, we ensure that everything that gets
created also gets destroyed as expected.
This replaces all of the various "std::cout << whatever" code in
constructors/destructors with
`print_created(this)`/`print_destroyed(this)`/etc. functions which
provide similar output, but now has a unified format across the
different examples, including a new ### prefix that makes mixed example
output and lifecycle events easier to distinguish.
With this change, relaxed mode is no longer needed, which enables
testing for proper destruction under MSVC, and under any other compiler
that generates code calling extra constructors, or optimizes away any
constructors. GCC/clang are used as the baseline for move
constructors; the tests are adapted to allow more move constructors to
be evoked (but other types are constructors much have matching counts).
This commit also disables output buffering of tests, as the buffering
sometimes results in C++ output ending up in the middle of python
output (or vice versa), depending on the OS/python version.
2016-08-07 17:05:26 +00:00
|
|
|
// Export the payload constructor statistics for testing purposes:
|
|
|
|
m.def("payload_cstats", &ConstructorStats::get<Payload>);
|
2015-07-05 18:05:44 +00:00
|
|
|
}
|