Modify GLOBAL_MODULE type.

Author: jmjoy

examples/hello/src/lib.rs

@@ -23,11 +23,8 @@ fn throw_exception(_: &mut [Val]) -> phper::Result<()> {
 }
 
 #[php_get_module]
-pub fn get_module(module: &mut Module) {
-    // set module metadata
-    module.set_name(env!("CARGO_PKG_NAME"));
-    module.set_version(env!("CARGO_PKG_VERSION"));
-    module.set_author(env!("CARGO_PKG_AUTHORS"));
+pub fn get_module() -> Module {
+    let mut module = Module::new(env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"), env!("CARGO_PKG_AUTHORS"));
 
     // register module ini
     module.add_bool_ini("hello.enable", false, Policy::All);
@@ -81,4 +78,6 @@ pub fn get_module(module: &mut Module) {
         vec![Argument::by_val("foo")],
     );
     module.add_class("FooClass", foo_class);
+
+    module
 }

examples/log/src/lib.rs

@@ -4,11 +4,8 @@ use phper::{
 };
 
 #[php_get_module]
-pub fn get_module(module: &mut Module) {
-    // set module metadata
-    module.set_name(env!("CARGO_PKG_NAME"));
-    module.set_version(env!("CARGO_PKG_VERSION"));
-    module.set_author(env!("CARGO_PKG_AUTHORS"));
+pub fn get_module() -> Module {
+    let mut module = Module::new(env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"), env!("CARGO_PKG_AUTHORS"));
 
     module.add_function(
         "log_say",
@@ -54,4 +51,6 @@ pub fn get_module(module: &mut Module) {
         },
         vec![Argument::by_val("message")],
     );
+
+    module
 }

phper-macros/src/inner.rs

@@ -27,14 +27,8 @@ pub(crate) fn php_get_module(_attr: TokenStream, input: TokenStream) -> TokenStr
             fn internal(#inputs) #ret {
                 #body
             }
-            let internal: fn(module: &mut ::phper::modules::Module) = internal;
-
-            ::phper::modules::write_global_module(internal);
-            unsafe {
-                ::phper::modules::write_global_module(|module| {
-                    module.module_entry()
-                })
-            }
+            let internal: fn() -> ::phper::modules::Module = internal;
+            unsafe { internal().module_entry() }
         }
     };
 

phper/src/modules.rs

@@ -17,19 +17,18 @@ use std::{
     ptr::{null, null_mut},
     sync::RwLock,
 };
+use std::sync::atomic::{AtomicPtr, Ordering};
 
-static GLOBAL_MODULE: Lazy<RwLock<Module>> = Lazy::new(Default::default);
+static GLOBAL_MODULE: AtomicPtr<Module> = AtomicPtr::new(null_mut());
 
-#[doc(hidden)]
-pub fn read_global_module<R>(f: impl FnOnce(&Module) -> R) -> R {
-    let module = (&*GLOBAL_MODULE).read().expect("get write lock failed");
-    f(&module)
+pub(crate) fn read_global_module<R>(f: impl FnOnce(&Module) -> R) -> R {
+    let module = GLOBAL_MODULE.load(Ordering::SeqCst);
+    f(unsafe { module.as_ref() }.expect("GLOBAL_MODULE is null"))
 }
 
-#[doc(hidden)]
-pub fn write_global_module<R>(f: impl FnOnce(&mut Module) -> R) -> R {
-    let mut module = (&*GLOBAL_MODULE).write().expect("get write lock failed");
-    f(&mut module)
+pub(crate) fn write_global_module<R>(f: impl FnOnce(&mut Module) -> R) -> R {
+    let module = GLOBAL_MODULE.load(Ordering::SeqCst);
+    f(unsafe { module.as_mut() }.expect("GLOBAL_MODULE is null"))
 }
 
 unsafe extern "C" fn module_startup(r#type: c_int, module_number: c_int) -> c_int {
@@ -84,7 +83,6 @@ unsafe extern "C" fn module_info(zend_module: *mut zend_module_entry) {
     display_ini_entries(zend_module);
 }
 
-#[derive(Default)]
 pub struct Module {
     name: String,
     version: String,
@@ -105,19 +103,18 @@ impl Module {
         static STR_INI_ENTITIES: RefCell<HashMap<String, IniEntity<StrPtrBox>>> = Default::default();
     }
 
-    pub fn set_name(&mut self, name: impl ToString) {
-        let name = ensure_end_with_zero(name);
-        self.name = name;
-    }
-
-    pub fn set_version(&mut self, version: impl ToString) {
-        let version = ensure_end_with_zero(version);
-        self.version = version;
-    }
-
-    pub fn set_author(&mut self, author: impl ToString) {
-        let author = ensure_end_with_zero(author);
-        self.author = author;
+    pub fn new(name: impl ToString, version: impl ToString, author: impl ToString) -> Self {
+        Self {
+            name: ensure_end_with_zero(name),
+            version: ensure_end_with_zero(version),
+            author: ensure_end_with_zero(author),
+            module_init: None,
+            module_shutdown: None,
+            request_init: None,
+            request_shutdown: None,
+            function_entities: vec![],
+            class_entities: Default::default(),
+        }
     }
 
     pub fn on_module_init(&mut self, func: impl Fn(ModuleArgs) -> bool + Send + Sync + 'static) {
@@ -225,7 +222,7 @@ impl Module {
             .insert(name.to_string(), unsafe { ClassEntity::new(name, class) });
     }
 
-    pub unsafe fn module_entry(&mut self) -> *const zend_module_entry {
+    pub unsafe fn module_entry(mut self) -> *const zend_module_entry {
         assert!(!self.name.is_empty(), "module name must be set");
         assert!(!self.version.is_empty(), "module version must be set");
 
@@ -261,7 +258,9 @@ impl Module {
             build_id: PHP_MODULE_BUILD_ID,
         });
 
-        Box::into_raw(entry)
+        let entry = Box::into_raw(entry);
+        GLOBAL_MODULE.store(Box::into_raw(Box::new(self)), Ordering::SeqCst);
+        entry
     }
 
     fn function_entries(&self) -> *const zend_function_entry {