ldd ch04: setting dir - WIP

Author: gurugio

rust/kernel/proc.rs

@@ -112,27 +112,34 @@ pub trait ProcOperations {
 
 /// TBD
 pub struct RustProcRegistration {
-    parent: *mut bindings::proc_dir_entry,
-    pub dir: *mut bindings::proc_dir_entry,
+    dir: *mut bindings::proc_dir_entry,
     entry: *mut bindings::proc_dir_entry,
     _pin: PhantomPinned,
 }
 
 impl RustProcRegistration {
     /// TBD
-    pub fn new(parent: *mut bindings::proc_dir_entry) -> Self {
+    pub fn new(dir: *mut bindings::proc_dir_entry) -> Self {
         Self {
-            parent,
-            dir: ptr::null_mut(),
+            dir,
             entry: ptr::null_mut(),
             _pin: PhantomPinned,
         }
     }
 
     /// TBD
-    pub fn mkdir(&mut self, name: &CString) -> Result<()> {
-        self.dir = unsafe { from_err_ptr(bindings::proc_mkdir(name.as_char_ptr(), self.parent)) }?;
-        Ok(())
+    pub fn mkdir(
+        name: &CString,
+        parent: *mut bindings::proc_dir_entry,
+    ) -> Result<*mut bindings::proc_dir_entry> {
+        // TODO: setting parent generated panic!!!
+        //unsafe { from_err_ptr(bindings::proc_mkdir(name.as_char_ptr(), parent)) }
+        unsafe {
+            from_err_ptr(bindings::proc_mkdir(
+                name.as_char_ptr(),
+                core::ptr::null_mut(),
+            ))
+        }
     }
 
     /// TBD
@@ -173,10 +180,6 @@ unsafe impl Sync for RustProcRegistration {}
 impl Drop for RustProcRegistration {
     fn drop(&mut self) {
         unsafe {
-            //let entry_name = CString::try_from_fmt(fmt!("{}", PROC_FS_NAME)).unwrap();
-            //bindings::remove_proc_entry(entry_name.as_char_ptr(), self._parent);
-            //let parent_name = CString::try_from_fmt(fmt!("{}", SUB_DIR_NAME)).unwrap();
-            //bindings::remove_proc_entry(_SUB_DIR_NAME.as_char_ptr(), ptr::null_mut());
             bindings::proc_remove(self.entry);
             bindings::proc_remove(self.dir)
         }

samples/rust/rust_ldd04.rs

@@ -97,7 +97,7 @@ impl ProcOperations for Token {
 }
 
 struct RustProc {
-    _reg: RustProcRegistration,
+    _regs: Vec<RustProcRegistration>,
 }
 
 impl kernel::Module for RustProc {
@@ -108,15 +108,19 @@ impl kernel::Module for RustProc {
         let filename: CString = CString::try_from_fmt(fmt!("proc_fs")).unwrap();
         let filename_mul = CString::try_from_fmt(fmt!("proc_fs_mul")).unwrap();
 
-        let mut reg = RustProcRegistration::new(core::ptr::null_mut());
-        reg.mkdir(&dirname)?;
+        let dir = RustProcRegistration::mkdir(&dirname, core::ptr::null_mut())?;
+
+        let mut regs = Vec::new();
+
+        let mut reg = RustProcRegistration::new(dir);
         reg.register::<Token>(&filename, None)?;
+        regs.try_push(reg)?;
 
-        // set the same directory
-        let mut reg = RustProcRegistration::new(reg.dir);
+        let mut reg = RustProcRegistration::new(dir);
         reg.register::<Token>(&filename_mul, Some(3))?;
+        regs.try_push(reg)?;
 
-        Ok(Self { _reg: reg })
+        Ok(Self { _regs: regs })
     }
 }