diff options
author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2013-09-11 08:00:28 -0700 |
---|---|---|
committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2013-09-11 08:00:28 -0700 |
commit | 68fd128d82819db1022137a45ca3224cee8ef029 (patch) | |
tree | 6f01d5456d830de9d24150ec56e5c1ee4d464faa /include | |
parent | f08f5850fa39c42974e12e42fa101ffe51eef594 (diff) |
The environment object that is passed to functions now always is the same environment object, added move operator= to Value class to make moving zvals faster, and added request startup and request closedown methods
Diffstat (limited to 'include')
-rw-r--r-- | include/extension.h | 40 | ||||
-rw-r--r-- | include/globals.h | 58 | ||||
-rw-r--r-- | include/value.h | 7 |
3 files changed, 99 insertions, 6 deletions
diff --git a/include/extension.h b/include/extension.h index b322533..ceeed78 100644 --- a/include/extension.h +++ b/include/extension.h @@ -29,6 +29,11 @@ struct _zend_module_entry; namespace Php { /** + * Optional callback types for starting and stopping the request + */ +typedef bool (*request_callback)(Environment &); + +/** * A couple of predefined native callback functions that can be registered. * These are functions that optional accept a Request and/or Parameters object, * and that either return void or a Value object. @@ -52,9 +57,10 @@ public: * Constructor that defines a number of functions right away * @param name Extension name * @param version Extension version string - * @param functions The functions that are defined + * @param callback Function that is called when request starts + * @param callback Function that is called when request ends */ - Extension(const char *name = NULL, const char *version = NULL); + Extension(const char *name = NULL, const char *version = NULL, request_callback start = NULL, request_callback stop = NULL); /** * No copy'ing and no moving @@ -109,6 +115,7 @@ public: */ virtual Environment *createEnvironment() { + // allocate the environment return new Environment(this); } @@ -121,6 +128,7 @@ public: */ virtual void deleteEnvironment(Environment *environment) { + // destruct the environment delete environment; } @@ -133,9 +141,13 @@ public: * * @return boolean */ - bool startRequest(Environment &environment) + virtual bool startRequest(Environment &environment) { - return true; + // ok if no callback was set + if (!_start) return true; + + // call the callback function + return _start(environment); } /** @@ -146,9 +158,13 @@ public: * * @return boolean */ - bool endRequest(Environment &environment) + virtual bool endRequest(Environment &environment) { - return true; + // ok if no callback is set + if (!_stop) return true; + + // call callback + return _stop(environment); } /** @@ -212,6 +228,18 @@ private: */ _zend_module_entry *_entry; + /** + * Callback that is called before each request + * @var request_callback + */ + request_callback _start; + + /** + * Callback that is called after each request + * @var request_callback + */ + request_callback _stop; + }; /** diff --git a/include/globals.h b/include/globals.h new file mode 100644 index 0000000..052bab8 --- /dev/null +++ b/include/globals.h @@ -0,0 +1,58 @@ +/** + * Globals.h + * + * Variables and structured required by the Zend engine to work + * with global variables + * + * @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com> + * @copyright 2013 Copernica BV + */ + +/** + * Namespace + */ +namespace Php { + +/** + * The way how PHP C API deals with "global" variables is stupid. + * + * This is supposed to turn into a structure that is going to be + * instantiated for each parallel running request, and for which the + * PHP engine allocates a certain amount of memory, and a magic + * pointer that is passed and should be forwarded to every thinkable + * PHP function. + * + * We don't like this architecture. We have our own environment object + * that makes much more sense, and that we use. However, we need + * to assign this object somewhere, so that's what we do in this + * one and only global variable + */ +ZEND_BEGIN_MODULE_GLOBALS(phpcpp) + Php::Environment *environment; +ZEND_END_MODULE_GLOBALS(phpcpp) + +/** + * And now we're going to define a macro. This also is a ridiculous + * architecture from PHP to get access to a variable from the + * structure above. + */ +#ifdef ZTS +#define PHPCPP_G(v) TSRMG(phpcpp_globals_id, phpcpp_globals *, v) +#else +#define PHPCPP_G(v) (phpcpp_globals.v) +#endif + +/** + * We're almost there, we now need to declare an instance of the + * structure defined above (if building for a single thread) or some + * sort of impossible to understand magic pointer-to-a-pointer (for + * multi-threading builds). We make this a static variable because + * this already is bad enough. + */ +extern ZEND_DECLARE_MODULE_GLOBALS(phpcpp) + +/** + * End of namespace + */ +} + diff --git a/include/value.h b/include/value.h index e4af1b7..4854437 100644 --- a/include/value.h +++ b/include/value.h @@ -124,6 +124,13 @@ public: virtual Value &operator=(const Value &value); /** + * Move assignment + * @param value + * @return Value + */ + virtual Value &operator=(Value &&value); + + /** * Assignment operator * @param value * @return Value |