Merge pull request #29 from vertexclique/new-ring-structure

new ring structure
vertexclique · Jan 20, 2024 · ae993e3 · ae993e3
2 parents d16da38 + fa0e230
commit ae993e3
Show file tree

Hide file tree

Showing 22 changed files with 324 additions and 321 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "nuclei"
 version = "0.2.1"
 authors = ["Mahmut Bulut <[email protected]>"]
-edition = "2018"
+edition = "2021"
 description = "Proactive IO & runtime system"
 keywords = ["io", "async", "uring", "iouring", "proactor"]
 categories = ["concurrency", "asynchronous"]
@@ -31,29 +31,29 @@ autoexamples = false
 
 
 [features]
-default = ["async-exec", "epoll"]
+default = ["async-exec", "iouring"]
 # Devs should enable these features to use iouring on linux.
 #default = ["asyncstd", "iouring"]
 epoll = []
-iouring = ["iou", "uring-sys"]
+iouring = ["rustix-uring", "rustix"]
 
 async-exec = ["async-global-executor"]
-tokio03 = ["async-global-executor/tokio03"]
-tokio02 = ["async-global-executor/tokio02"]
 tokio = ["async-global-executor/tokio"]
 
 [dependencies]
 lever = "0.1"
 futures = { version = "0.3", default-features = false, features = ["std", "async-await"] }
-socket2 = { version = "0.3.12", features = ["pair", "unix"] }
+socket2 = { version = "0.3.19", features = ["pair", "unix"] }
 pin-utils = "0.1.0"
-once_cell = "1.4.0"
-async-global-executor = { version = "2.0", optional = true, features = ["async-io"] }
+once_cell = "1.19.0"
+os_socketaddr = "0.2.5"
+ahash = "0.8.7"
+async-global-executor = { version = "2.4", optional = true, features = ["async-io"] }
 
 # Other backends
 [target.'cfg(target_os = "linux")'.dependencies]
-iou = { version = "0.0.0-ringbahn.1", optional = true }
-uring-sys = { version = "0.6.1", optional = true }
+rustix = { version = "0.38", optional = true }
+rustix-uring = { version = "0.2.0", optional = true }
 
 [target.'cfg(target_family = "unix")'.dependencies]
 libc = { version = "0.2" }

diff --git a/docs/.firebaserc b/docs/.firebaserc
@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "nuclei"
+  }
+}
diff --git a/docs/.gitignore b/docs/.gitignore
@@ -0,0 +1 @@
+.idea/
diff --git a/docs/.nojekyll b/docs/.nojekyll
diff --git a/docs/_coverpage.md b/docs/_coverpage.md
@@ -0,0 +1,5 @@
+# <img src="https://raw.githubusercontent.com/vertexclique/nuclei/master/img/nuclei-logo.png">
+PROACTIVE IO & RUNTIME SYSTEM <small>est. 2019</small>
+
+[![](assets/img/github.svg) GitHub](https://github.com/vertexclique/nuclei)
+[![](assets/img/sitemap-solid.svg) What is Nuclei?](https://vertexclique.github.io/nuclei/)
diff --git a/docs/assets/img/github.svg b/docs/assets/img/github.svg
diff --git a/docs/assets/img/sitemap-solid.svg b/docs/assets/img/sitemap-solid.svg
diff --git a/docs/firebase.json b/docs/firebase.json
@@ -0,0 +1,10 @@
+{
+  "hosting": {
+    "public": ".",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ]
+  }
+}
diff --git a/docs/index.html b/docs/index.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1.0, shrink-to-fit=no, viewport-fit=cover">
+  <meta name="description" content="">
+  <title></title>
+
+  <!-- Themes (light + dark) -->
+  <link rel="stylesheet" media="(prefers-color-scheme: dark)" href="https://cdn.jsdelivr.net/npm/docsify-themeable@0/dist/css/theme-simple-dark.css">
+
+  <!-- PrismJS theme -->
+  <link rel="stylesheet" href="https://unpkg.com/[email protected]/themes/prism-night-owl.min.css">
+
+  <!-- Custom Styles -->
+  <style>
+    :root {
+      --theme-hue: 120;
+      --theme-color: rgb(106, 25, 205);
+      /* <a href="https://ibb.co/mhM4z6P"><img src="https://i.ibb.co/DwSQK5j/vibrant-obelisk.png" alt="vibrant-obelisk" border="0"></a> */
+      --cover-background-color: #00000000;
+      --cover-background-image: url(https://s13.gifyu.com/images/S0ULN.gif);
+      --cover-button-background: rgb(118, 198, 251);
+      --cover-button-border: rgb(118, 198, 251);
+      --cover-button-border: 1px solid var(--theme-color);
+      --cover-heading-color: rgb(106, 25, 205);
+      --cover-heading-font-size: 100px;
+      --cover-heading-font-size-min: ;
+      --cover-heading-font-size-max: 500px;
+    }
+  </style>
+</head>
+<body>
+<div id="app"></div>
+
+<script>
+  // Docsify Configuration
+  window.$docsify = {
+    // GENERAL
+    // -----------------------------------------------------------------
+    name       : 'Nuclei - Proactive IO & Runtime system',
+    repo: 'vertexclique/nuclei',
+    coverpage  : 'coverpage.md',
+    homepage   : 'introduction.md',
+    loadSidebar: 'sidebar.md',
+
+    coverpage: true,
+    themeable: {
+      readyTransition : true, // default
+      responsiveTables: true  // default
+    }
+  };
+</script>
+
+<!-- Required -->
+<script src="https://cdn.jsdelivr.net/npm/docsify@4/lib/docsify.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/docsify-themeable@0/dist/js/docsify-themeable.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/docsify-pagination.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/docsify-tabs.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/docsify-prism@latest/dist/docsify-prism.min.js"></script>
+
+<!-- CDN files for prism -->
+<script src="//unpkg.com/[email protected]/prism.js"></script>
+<script src="//unpkg.com/[email protected]/components/prism-rust.min.js"></script>
+<script src="//unpkg.com/[email protected]/components/prism-toml.min.js"></script>
+<script src="//unpkg.com/[email protected]/components/prism-python.min.js"></script>
+<script src="//unpkg.com/[email protected]/components/prism-json.min.js"></script>
+
+<!-- Recommended -->
+<script src="https://cdn.jsdelivr.net/npm/docsify@4/lib/plugins/search.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/docsify@4/lib/plugins/zoom-image.min.js"></script>
+</body>
+</html>
diff --git a/docs/introduction.md b/docs/introduction.md
@@ -0,0 +1 @@
+# Nuclei
diff --git a/docs/quickstart.md b/docs/quickstart.md
@@ -0,0 +1 @@
+# Quickstart Guide
diff --git a/docs/sidebar.md b/docs/sidebar.md
@@ -0,0 +1,6 @@
+<!-- markdownlint-disable-next-line first-line-heading -->
+- [Introduction](introduction)
+- [Quickstart Guide](quickstart)
+- **Internals**
+- [Design Principles](designprinciples)
+- [Recovery System](recosystem)
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -6,7 +6,8 @@ edition = "2018"
 publish = false
 
 [dev-dependencies]
-nuclei = { path = "../" }
+#nuclei = { path = "../" }
+nuclei = { path = "../", default-features = false, features = ["async-exec", "iouring"]}
 futures = { version = "0.3", default-features = false, features = ["std", "async-await"] }
 futures-util = "0.3"
 anyhow = "1.0.31"

diff --git a/examples/fread.rs b/examples/fread.rs
@@ -1,6 +1,7 @@
 use nuclei::*;
 use std::fs::File;
 use std::io;
+use std::io::{Seek, SeekFrom};
 use std::path::PathBuf;
 
 use futures::AsyncReadExt;
@@ -10,6 +11,7 @@ fn main() -> io::Result<()> {
         let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
         path.push("data");
         path.push("quark-gluon-plasma");
+        dbg!(&path);
 
         let fo = File::open(&path).unwrap();
         let mut file = Handle::<File>::new(fo).unwrap();
@@ -19,7 +21,7 @@ fn main() -> io::Result<()> {
     });
     let x = x?;
 
-    // println!("Content: {}", x);
+    println!("Content: {}", x);
     println!("Length of file is {}", x.len());
 
     Ok(())

diff --git a/img/nuclei-logo.png b/img/nuclei-logo.png
diff --git a/src/proactor.rs b/src/proactor.rs
@@ -13,6 +13,8 @@ pub use super::handle::*;
 ///
 /// Concrete proactor instance
 pub struct Proactor(SysProactor);
+unsafe impl Send for Proactor {}
+unsafe impl Sync for Proactor {}
 
 impl Proactor {
     /// Returns a reference to the proactor.

diff --git a/src/syscore/bsd/kqueue.rs b/src/syscore/bsd/kqueue.rs
@@ -8,7 +8,8 @@ use std::mem::MaybeUninit;
 use std::os::unix::io::{AsRawFd, RawFd};
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use std::{collections::HashMap, os::unix::net::UnixStream, time::Duration};
+use ahash::{HashMap, HashMapExt};
+use std::{os::unix::net::UnixStream, time::Duration};
 
 macro_rules! syscall {
     ($fn:ident $args:tt) => {{

diff --git a/src/syscore/linux/epoll/epoll.rs b/src/syscore/linux/epoll/epoll.rs
@@ -2,13 +2,14 @@ use crate::sys::epoll::*;
 use futures::channel::oneshot;
 use lever::prelude::*;
 use pin_utils::unsafe_pinned;
+use ahash::HashMap;
 use std::future::Future;
 use std::io::{self, Read, Write};
 use std::mem::MaybeUninit;
 use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
 use std::pin::Pin;
 use std::task::{Context, Poll};
-use std::{collections::HashMap, fs::File, time::Duration};
+use std::{fs::File, time::Duration};
 
 macro_rules! syscall {
     ($fn:ident $args:tt) => {{

diff --git a/src/syscore/linux/iouring/fs/buffer.rs b/src/syscore/linux/iouring/fs/buffer.rs
@@ -6,6 +6,7 @@ use std::mem;
 use std::ptr::NonNull;
 use std::slice;
 use std::task::Poll;
+use rustix_uring::types::Statx;
 
 use super::cancellation::Cancellation;
 
@@ -99,7 +100,7 @@ impl Buffer {
             }
             Storage::Statx => {
                 unsafe fn callback(statx: *mut (), _: usize) {
-                    dealloc(statx as *mut u8, Layout::new::<libc::statx>())
+                    dealloc(statx as *mut u8, Layout::new::<Statx>())
                 }
 
                 self.storage = Storage::Nothing;
@@ -110,7 +111,7 @@ impl Buffer {
         }
     }
 
-    pub(crate) fn as_statx(&mut self) -> *mut libc::statx {
+    pub(crate) fn as_statx(&mut self) -> *mut Statx {
         match self.storage {
             Storage::Statx => self.data.cast().as_ptr(),
             Storage::Nothing => self.alloc_statx(),
@@ -124,7 +125,7 @@ impl Buffer {
         unsafe { slice::from_raw_parts_mut(self.data.cast().as_ptr(), self.capacity as usize) }
     }
 
-    fn alloc_statx(&mut self) -> &mut libc::statx {
+    fn alloc_statx(&mut self) -> &mut Statx {
         self.storage = Storage::Statx;
         self.alloc();
         unsafe { &mut *self.data.cast().as_ptr() }
@@ -145,7 +146,7 @@ impl Buffer {
     #[inline(always)]
     fn layout(&self) -> Option<Layout> {
         match self.storage {
-            Storage::Statx => Some(Layout::new::<libc::statx>()),
+            Storage::Statx => Some(Layout::new::<Statx>()),
             Storage::Buffer => Some(Layout::array::<u8>(self.capacity as usize).unwrap()),
             Storage::Nothing => None,
         }