Adjust module api. (#99)

Author: jmjoy

examples/complex/src/lib.rs

@@ -13,7 +13,7 @@ use phper::{
     classes::{ClassEntity, Visibility},
     functions::Argument,
     ini::{ini_get, Policy},
-    modules::{Module, ModuleContext},
+    modules::Module,
     objects::StateObj,
     php_get_module,
     values::ZVal,
@@ -50,10 +50,10 @@ pub fn get_module() -> Module {
     );
 
     // register hook functions
-    module.on_module_init(|_: ModuleContext| true);
-    module.on_module_shutdown(|_| true);
-    module.on_request_init(|_| true);
-    module.on_request_shutdown(|_| true);
+    module.on_module_init(|| true);
+    module.on_module_shutdown(|| true);
+    module.on_request_init(|| true);
+    module.on_request_shutdown(|| true);
 
     // register functions
     module

examples/http-server/src/lib.rs

@@ -37,12 +37,12 @@ pub fn get_module() -> Module {
     let rt = Arc::new(rt);
     let rt_ = rt.clone();
 
-    module.on_module_init(move |_| {
+    module.on_module_init(move || {
         let guard = rt_.enter();
         forget(guard);
         true
     });
-    module.on_module_shutdown(move |_| {
+    module.on_module_shutdown(move || {
         drop(rt);
         true
     });

phper-doc/doc/_06_module/_01_hooks/index.md

@@ -35,7 +35,7 @@ pub fn get_module() -> Module {
         env!("CARGO_PKG_AUTHORS"),
     );
 
-    module.on_module_init(|_| {
+    module.on_module_init(|| {
         // Do somethings in `MINIT` stage.
         true
     });

phper-sys/php_wrapper.c

@@ -433,3 +433,7 @@ zend_internal_arg_info phper_zend_arg_info(bool pass_by_ref, const char *name) {
     info[0].name = name;
     return info[0];
 }
+
+void *phper_z_ptr_p(const zval *zv) {
+    return Z_PTR_P(zv);
+}

phper/src/classes.rs

@@ -125,7 +125,7 @@ impl ClassEntry {
     /// let std_class = ClassEntry::from_globals("stdClass").unwrap();
     /// let _obj = std_class.new_object([]).unwrap();
     /// ```
-    pub fn from_globals<'a>(class_name: impl AsRef<str>) -> crate::Result<&'a Self> {
+    pub fn from_globals(class_name: impl AsRef<str>) -> crate::Result<&'static Self> {
         let name = class_name.as_ref();
         let ptr: *mut Self = find_global_class_entry_ptr(name).cast();
         unsafe {
@@ -332,7 +332,7 @@ impl<T: 'static> ClassEntity<T> {
     }
 
     #[allow(clippy::useless_conversion)]
-    pub(crate) unsafe fn init(&mut self) -> *mut zend_class_entry {
+    pub(crate) unsafe fn init(&self) -> *mut zend_class_entry {
         let parent: *mut zend_class_entry = self
             .parent
             .as_ref()

phper/src/constants.rs

@@ -10,7 +10,7 @@
 
 //! Apis relate to [crate::sys::zend_constant].
 
-use crate::{modules::ModuleContext, sys::*, types::Scalar};
+use crate::{sys::*, types::Scalar};
 use std::ffi::{c_char, c_int};
 
 pub(crate) struct Constant {
@@ -26,22 +26,33 @@ impl Constant {
         }
     }
 
-    pub(crate) fn register(&self, module_context: &ModuleContext) {
+    pub(crate) fn register(&self, module_number: c_int) {
         let name_ptr = self.name.as_ptr() as *const c_char;
         let name_len = self.name.len();
         let flags = (CONST_PERSISTENT | CONST_CS) as c_int;
-        let num = module_context.module_number;
 
         unsafe {
             match &self.value {
-                Scalar::Null => zend_register_null_constant(name_ptr, name_len, flags, num),
-                Scalar::Bool(b) => {
-                    zend_register_bool_constant(name_ptr, name_len, *b as zend_bool, flags, num)
+                Scalar::Null => {
+                    zend_register_null_constant(name_ptr, name_len, flags, module_number)
                 }
-                Scalar::I64(i) => {
-                    zend_register_long_constant(name_ptr, name_len, *i as zend_long, flags, num)
+                Scalar::Bool(b) => zend_register_bool_constant(
+                    name_ptr,
+                    name_len,
+                    *b as zend_bool,
+                    flags,
+                    module_number,
+                ),
+                Scalar::I64(i) => zend_register_long_constant(
+                    name_ptr,
+                    name_len,
+                    *i as zend_long,
+                    flags,
+                    module_number,
+                ),
+                Scalar::F64(f) => {
+                    zend_register_double_constant(name_ptr, name_len, *f, flags, module_number)
                 }
-                Scalar::F64(f) => zend_register_double_constant(name_ptr, name_len, *f, flags, num),
                 Scalar::String(s) => {
                     let s_ptr = s.as_ptr() as *mut u8;
                     zend_register_stringl_constant(
@@ -50,7 +61,7 @@ impl Constant {
                         s_ptr.cast(),
                         s.len(),
                         flags,
-                        num,
+                        module_number,
                     )
                 }
                 Scalar::Bytes(s) => {
@@ -61,7 +72,7 @@ impl Constant {
                         s_ptr.cast(),
                         s.len(),
                         flags,
-                        num,
+                        module_number,
                     )
                 }
             }

phper/src/ini.rs

@@ -12,8 +12,8 @@
 
 use crate::sys::*;
 use std::{
-    ffi::CStr,
-    mem::{zeroed, ManuallyDrop},
+    ffi::{c_int, CStr},
+    mem::zeroed,
     os::raw::c_char,
     ptr::null_mut,
     str,
@@ -155,7 +155,7 @@ impl IniEntity {
     }
 
     #[inline]
-    pub(crate) fn entry(&mut self) -> zend_ini_entry_def {
+    pub(crate) fn entry(&self) -> zend_ini_entry_def {
         create_ini_entry_ex(&self.name, &self.default_value, self.policy as u32)
     }
 }
@@ -194,16 +194,27 @@ fn create_ini_entry_ex(name: &str, default_value: &str, modifiable: u32) -> zend
     }
 }
 
-pub(crate) unsafe fn entries(ini_entries: Vec<IniEntity>) -> *const zend_ini_entry_def {
+unsafe fn entries(ini_entries: &[IniEntity]) -> *const zend_ini_entry_def {
     let mut entries = Vec::with_capacity(ini_entries.len() + 1);
 
-    ini_entries.into_iter().for_each(|entity| {
+    ini_entries.iter().for_each(|entity| {
         // Ini entity will exist throughout the whole application life cycle.
-        let mut entity = ManuallyDrop::new(entity);
         entries.push(entity.entry());
     });
 
     entries.push(zeroed::<zend_ini_entry_def>());
 
     Box::into_raw(entries.into_boxed_slice()).cast()
 }
+
+pub(crate) fn register(ini_entries: &[IniEntity], module_number: c_int) {
+    unsafe {
+        zend_register_ini_entries(entries(ini_entries), module_number);
+    }
+}
+
+pub(crate) fn unregister(module_number: c_int) {
+    unsafe {
+        zend_unregister_ini_entries(module_number);
+    }
+}