phper-alloc: add Allocator and EBox.

Author: jmjoy

phper-alloc/Cargo.toml

@@ -11,3 +11,4 @@ keywords = ["php", "alloc"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+phper-sys = { version = "0.2", path = "../phper-sys" }

phper-alloc/src/lib.rs

@@ -1,18 +1,27 @@
-use std::alloc::{GlobalAlloc, Layout, System};
+#![feature(allocator_api)]
 
-struct MyAllocator;
+use std::alloc::{AllocRef, Layout, AllocError};
+use std::ptr::{NonNull, slice_from_raw_parts_mut};
+use phper_sys::{_emalloc, _efree};
 
-unsafe impl GlobalAlloc for MyAllocator {
-    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        eprintln!("GlobalAlloc::alloc");
-        System.alloc(layout)
+pub type EBox<T> = Box<T, Allocator>;
+
+pub struct Allocator;
+
+unsafe impl AllocRef for Allocator {
+    fn alloc(&self, layout: Layout) -> Result<NonNull<[u8]>, AllocError> {
+        unsafe {
+            let ptr = _emalloc(layout.size());
+            if ptr.is_null() {
+                Err(AllocError)
+            } else {
+                let ptr = slice_from_raw_parts_mut(ptr.cast(), layout.size());
+                Ok(NonNull::new_unchecked(ptr))
+            }
+        }
     }
 
-    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-        eprintln!("GlobalAlloc::dealloc");
-        System.dealloc(ptr, layout)
+    unsafe fn dealloc(&self, ptr: NonNull<u8>, _layout: Layout) {
+        _efree(ptr.as_ptr().cast());
     }
 }
-
-//#[global_allocator]
-//static GLOBAL: MyAllocator = MyAllocator;

phper-sys/build.rs

@@ -13,33 +13,6 @@ fn main() {
 
     let php_config = env::var("PHP_CONFIG").unwrap_or("php-config".to_string());
 
-    // Generate php const.
-
-    let php_bin = execute_command(&[php_config.as_str(), "--php-binary"]);
-    let php_info = execute_command(&[php_bin.as_str(), "-i"]);
-
-    let php_extension_build = php_info
-        .lines()
-        .find_map(|line| {
-            if line.starts_with("PHP Extension Build") {
-                Some(
-                    line.chars()
-                        .skip_while(|c| *c != 'A')
-                        .collect::<String>()
-                        .trim()
-                        .to_owned(),
-                )
-            } else {
-                None
-            }
-        })
-        .expect("Can't found the field `PHP Extension Build`");
-
-    println!(
-        "cargo:rustc-env=PHP_EXTENSION_BUILD={}",
-        php_extension_build
-    );
-
     // Generate bindgen file.
     let includes = execute_command(&[php_config.as_str(), "--includes"]);
     let includes = includes.split(' ').collect::<Vec<_>>();

phper-sys/src/lib.rs

@@ -2,8 +2,4 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 
-use std::ffi::CStr;
-use std::os::raw::c_char;
-use std::ptr::null;
-
 include!(concat!(env!("OUT_DIR"), "/php_bindings.rs"));

phper/src/function.rs

@@ -1,6 +1,5 @@
 use crate::sys::{
-    c_str, zend_execute_data, zend_function_entry, zend_internal_arg_info, zval,
-    InternalRawFunction,
+    zend_execute_data, zend_function_entry, zend_internal_arg_info, zval,
 };
 
 use std::ffi::{c_void, CStr};

phper/src/lib.rs

@@ -31,7 +31,6 @@ pub extern crate phper_sys as sys;
 mod macros;
 
 pub use phper_macros::*;
-pub use phper_sys::c_str_ptr;
 
 mod arg;
 mod function;

phper/src/module.rs

@@ -1,5 +1,5 @@
 use crate::sys::{
-    c_str, zend_function_entry, zend_module_entry, PHP_EXTENSION_BUILD, USING_ZTS, ZEND_DEBUG,
+    zend_function_entry, zend_module_entry, USING_ZTS, ZEND_DEBUG,
     ZEND_MODULE_API_NO,
 };
 use crate::{functions_into_boxed_entries, Function, FunctionArray};