itsi 0.1.11 → 0.1.12

data/crates/itsi_server/src/server/thread_worker.rs

@@ -1,9 +1,8 @@
-use super::itsi_server::{RequestJob, Server};
-use crate::{request::itsi_request::ItsiRequest, ITSI_SERVER};
+use async_channel::Sender;
 use itsi_rb_helpers::{
-    call_with_gvl, call_without_gvl, create_ruby_thread, kill_threads, HeapVal, HeapValue,
+    call_with_gvl, call_without_gvl, create_ruby_thread, kill_threads, HeapValue,
 };
-use itsi_tracing::{debug, error, info, warn};
+use itsi_tracing::{debug, error, warn};
 use magnus::{
     error::Result,
     value::{InnerValue, Lazy, LazyId, Opaque, ReprValue},
@@ -15,26 +14,34 @@ use std::{
     num::NonZeroU8,
     ops::Deref,
     sync::{
-        atomic::{AtomicBool, Ordering},
+        atomic::{AtomicBool, AtomicU64, Ordering},
         Arc,
     },
     thread,
-    time::{Duration, Instant},
+    time::{Duration, Instant, SystemTime, UNIX_EPOCH},
 };
 use tokio::{runtime::Builder as RuntimeBuilder, sync::watch};
 use tracing::instrument;
+
+use crate::ruby_types::{
+    itsi_grpc_request::ItsiGrpcRequest, itsi_http_request::ItsiHttpRequest,
+    itsi_server::itsi_server_config::ServerParams, ITSI_SERVER,
+};
+
+use super::request_job::RequestJob;
 pub struct ThreadWorker {
-    pub server: Arc<Server>,
-    pub id: String,
-    pub app: Opaque<Value>,
+    pub params: Arc<ServerParams>,
+    pub id: u8,
+    pub name: String,
+    pub request_id: AtomicU64,
+    pub current_request_start: AtomicU64,
     pub receiver: Arc<async_channel::Receiver<RequestJob>>,
-    pub sender: async_channel::Sender<RequestJob>,
+    pub sender: Sender<RequestJob>,
     pub thread: RwLock<Option<HeapValue<Thread>>>,
     pub terminated: Arc<AtomicBool>,
     pub scheduler_class: Option<Opaque<Value>>,
 }
 
-static ID_CALL: LazyId = LazyId::new("call");
 static ID_ALIVE: LazyId = LazyId::new("alive?");
 static ID_SCHEDULER: LazyId = LazyId::new("scheduler");
 static ID_SCHEDULE: LazyId = LazyId::new("schedule");
@@ -48,28 +55,26 @@ static CLASS_FIBER: Lazy<RClass> = Lazy::new(|ruby| {
 });
 
 pub struct TerminateWakerSignal(bool);
+type ThreadWorkerBuildResult = Result<(Arc<Vec<Arc<ThreadWorker>>>, Sender<RequestJob>)>;
 
-#[instrument(name = "Boot", parent=None, skip(server, threads, app, pid, scheduler_class))]
+#[instrument(name = "boot", parent=None, skip(params, threads, pid))]
 pub fn build_thread_workers(
-    server: Arc<Server>,
+    params: Arc<ServerParams>,
     pid: Pid,
     threads: NonZeroU8,
-    app: HeapVal,
-    scheduler_class: Option<String>,
-) -> Result<(Arc<Vec<ThreadWorker>>, async_channel::Sender<RequestJob>)> {
-    let (sender, receiver) = async_channel::bounded(20);
+) -> ThreadWorkerBuildResult {
+    let (sender, receiver) = async_channel::bounded((threads.get() as u16 * 30) as usize);
     let receiver_ref = Arc::new(receiver);
     let sender_ref = sender;
-    let (app, scheduler_class) = load_app(app, scheduler_class)?;
+    let scheduler_class = load_scheduler_class(params.scheduler_class.clone())?;
     Ok((
         Arc::new(
             (1..=u8::from(threads))
                 .map(|id| {
-                    info!(pid = pid.as_raw(), id, "Thread");
                     ThreadWorker::new(
-                        server.clone(),
+                        params.clone(),
+                        id,
                         format!("{:?}#{:?}", pid, id),
-                        app,
                         receiver_ref.clone(),
                         sender_ref.clone(),
                         scheduler_class,
@@ -81,12 +86,8 @@ pub fn build_thread_workers(
     ))
 }
 
-pub fn load_app(
-    app: HeapVal,
-    scheduler_class: Option<String>,
-) -> Result<(Opaque<Value>, Option<Opaque<Value>>)> {
+pub fn load_scheduler_class(scheduler_class: Option<String>) -> Result<Option<Opaque<Value>>> {
     call_with_gvl(|ruby| {
-        let app = Opaque::from(app.funcall::<_, _, Value>(*ID_CALL, ())?);
         let scheduler_class = if let Some(scheduler_class) = scheduler_class {
             Some(Opaque::from(
                 ruby.module_kernel()
@@ -95,76 +96,67 @@ pub fn load_app(
         } else {
             None
         };
-        Ok((app, scheduler_class))
+        Ok(scheduler_class)
     })
 }
 impl ThreadWorker {
     pub fn new(
-        server: Arc<Server>,
-        id: String,
-        app: Opaque<Value>,
+        params: Arc<ServerParams>,
+        id: u8,
+        name: String,
         receiver: Arc<async_channel::Receiver<RequestJob>>,
-        sender: async_channel::Sender<RequestJob>,
+        sender: Sender<RequestJob>,
         scheduler_class: Option<Opaque<Value>>,
-    ) -> Result<Self> {
-        let mut worker = Self {
-            server,
+    ) -> Result<Arc<Self>> {
+        let worker = Arc::new(Self {
+            params,
             id,
-            app,
+            request_id: AtomicU64::new(0),
+            current_request_start: AtomicU64::new(0),
+            name,
             receiver,
             sender,
             thread: RwLock::new(None),
             terminated: Arc::new(AtomicBool::new(false)),
             scheduler_class,
-        };
-        worker.run()?;
+        });
+        worker.clone().run()?;
         Ok(worker)
     }
 
-    #[instrument(skip(self), fields(id = self.id))]
-    pub async fn request_shutdown(&self) {
-        match self.sender.send(RequestJob::Shutdown).await {
-            Ok(_) => {}
-            Err(err) => error!("Failed to send shutdown request: {}", err),
-        };
-        debug!("Requesting shutdown");
-    }
-
     #[instrument(skip(self, deadline), fields(id = self.id))]
     pub fn poll_shutdown(&self, deadline: Instant) -> bool {
-        call_with_gvl(|_ruby| {
-            if let Some(thread) = self.thread.read().deref() {
-                if Instant::now() > deadline {
-                    warn!("Worker shutdown timed out. Killing thread");
-                    self.terminated.store(true, Ordering::SeqCst);
-                    kill_threads(vec![thread.as_value()]);
-                }
-                if thread.funcall::<_, _, bool>(*ID_ALIVE, ()).unwrap_or(false) {
-                    return true;
-                }
-                debug!("Thread has shut down");
+        if let Some(thread) = self.thread.read().deref() {
+            if Instant::now() > deadline {
+                warn!("Worker shutdown timed out. Killing thread");
+                self.terminated.store(true, Ordering::SeqCst);
+                kill_threads(vec![thread.as_value()]);
             }
-            self.thread.write().take();
+            debug!("Checking thread status");
+            if thread.funcall::<_, _, bool>(*ID_ALIVE, ()).unwrap_or(false) {
+                return true;
+            }
+            debug!("Thread has shut down");
+        }
+        self.thread.write().take();
 
-            false
-        })
+        false
     }
 
-    pub fn run(&mut self) -> Result<()> {
-        let id = self.id.clone();
-        let app = self.app;
+    pub fn run(self: Arc<Self>) -> Result<()> {
+        let name = self.name.clone();
         let receiver = self.receiver.clone();
         let terminated = self.terminated.clone();
         let scheduler_class = self.scheduler_class;
-        let server = self.server.clone();
+        let params = self.params.clone();
+        let self_ref = self.clone();
         call_with_gvl(|_| {
             *self.thread.write() = Some(
                 create_ruby_thread(move || {
                     if let Some(scheduler_class) = scheduler_class {
-                        if let Err(err) = Self::fiber_accept_loop(
-                            server,
-                            id,
-                            app,
+                        if let Err(err) = self_ref.fiber_accept_loop(
+                            params,
+                            name,
                             receiver,
                             scheduler_class,
                             terminated,
@@ -172,7 +164,7 @@ impl ThreadWorker {
                             error!("Error in fiber_accept_loop: {:?}", err);
                         }
                     } else {
-                        Self::accept_loop(server, id, app, receiver, terminated);
+                        self_ref.accept_loop(params, name, receiver, terminated);
                     }
                 })
                 .into(),
@@ -183,7 +175,7 @@ impl ThreadWorker {
     }
 
     pub fn build_scheduler_proc(
-        app: Opaque<Value>,
+        self: Arc<Self>,
         leader: &Arc<Mutex<Option<RequestJob>>>,
         receiver: &Arc<async_channel::Receiver<RequestJob>>,
         terminated: &Arc<AtomicBool>,
@@ -205,6 +197,7 @@ impl ThreadWorker {
             let receiver = receiver.clone();
             let terminated = terminated.clone();
             let waker_sender = waker_sender.clone();
+            let self_ref = self.clone();
             let mut batch = Vec::with_capacity(MAX_BATCH_SIZE as usize);
 
             static MAX_BATCH_SIZE: i32 = 25;
@@ -212,8 +205,11 @@ impl ThreadWorker {
                 let mut idle_counter = 0;
                 if let Some(v) = leader_clone.lock().take() {
                     match v {
-                        RequestJob::ProcessRequest(itsi_request) => {
-                            batch.push(RequestJob::ProcessRequest(itsi_request))
+                        RequestJob::ProcessHttpRequest(itsi_request, app_proc) => {
+                            batch.push(RequestJob::ProcessHttpRequest(itsi_request, app_proc))
+                        }
+                        RequestJob::ProcessGrpcRequest(itsi_request, app_proc) => {
+                            batch.push(RequestJob::ProcessGrpcRequest(itsi_request, app_proc))
                         }
                         RequestJob::Shutdown => {
                             waker_sender.send(TerminateWakerSignal(true)).unwrap();
@@ -232,12 +228,38 @@ impl ThreadWorker {
                 let shutdown_requested = call_with_gvl(|_| {
                     for req in batch.drain(..) {
                         match req {
-                            RequestJob::ProcessRequest(request) => {
+                            RequestJob::ProcessHttpRequest(request, app_proc) => {
+                                self_ref.request_id.fetch_add(1, Ordering::Relaxed);
+                                self_ref.current_request_start.store(
+                                    SystemTime::now()
+                                        .duration_since(UNIX_EPOCH)
+                                        .unwrap()
+                                        .as_secs(),
+                                    Ordering::Relaxed,
+                                );
                                 let response = request.response.clone();
-                                if let Err(err) =
-                                    server.funcall::<_, _, Value>(*ID_SCHEDULE, (app, request))
-                                {
-                                    ItsiRequest::internal_error(ruby, response, err)
+                                if let Err(err) = server.funcall::<_, _, Value>(
+                                    *ID_SCHEDULE,
+                                    (app_proc.as_value(), request),
+                                ) {
+                                    ItsiHttpRequest::internal_error(ruby, response, err)
+                                }
+                            }
+                            RequestJob::ProcessGrpcRequest(request, app_proc) => {
+                                self_ref.request_id.fetch_add(1, Ordering::Relaxed);
+                                self_ref.current_request_start.store(
+                                    SystemTime::now()
+                                        .duration_since(UNIX_EPOCH)
+                                        .unwrap()
+                                        .as_secs(),
+                                    Ordering::Relaxed,
+                                );
+                                let response = request.stream.clone();
+                                if let Err(err) = server.funcall::<_, _, Value>(
+                                    *ID_SCHEDULE,
+                                    (app_proc.as_value(), request),
+                                ) {
+                                    ItsiGrpcRequest::internal_error(ruby, response, err)
                                 }
                             }
                             RequestJob::Shutdown => return true,
@@ -276,12 +298,11 @@ impl ThreadWorker {
         })
     }
 
-    #[instrument(skip_all, fields(thread_worker=id))]
+    #[instrument(skip_all, fields(thread_worker=name))]
     pub fn fiber_accept_loop(
-        server: Arc<Server>,
-
-        id: String,
-        app: Opaque<Value>,
+        self: Arc<Self>,
+        params: Arc<ServerParams>,
+        name: String,
         receiver: Arc<async_channel::Receiver<RequestJob>>,
         scheduler_class: Opaque<Value>,
         terminated: Arc<AtomicBool>,
@@ -290,13 +311,12 @@ impl ThreadWorker {
         let (waker_sender, waker_receiver) = watch::channel(TerminateWakerSignal(false));
         let leader: Arc<Mutex<Option<RequestJob>>> = Arc::new(Mutex::new(None));
         let server_class = ruby.get_inner(&ITSI_SERVER);
-        let scheduler_proc = Self::build_scheduler_proc(
-            app,
+        let scheduler_proc = self.build_scheduler_proc(
             &leader,
             &receiver,
             &terminated,
             &waker_sender,
-            server.oob_gc_responses_threshold,
+            params.oob_gc_responses_threshold,
         );
         let (scheduler, scheduler_fiber) = server_class.funcall::<_, _, (Value, Value)>(
             "start_scheduler_loop",
@@ -359,35 +379,60 @@ impl ThreadWorker {
 
     #[instrument(skip_all, fields(thread_worker=id))]
     pub fn accept_loop(
-        server: Arc<Server>,
+        self: Arc<Self>,
+        params: Arc<ServerParams>,
         id: String,
-        app: Opaque<Value>,
         receiver: Arc<async_channel::Receiver<RequestJob>>,
         terminated: Arc<AtomicBool>,
     ) {
         let ruby = Ruby::get().unwrap();
-        let server_class = ruby.get_inner(&ITSI_SERVER);
         let mut idle_counter = 0;
+        let self_ref = self.clone();
         call_without_gvl(|| loop {
             if receiver.is_empty() {
-                if let Some(oob_gc_threshold) = server.oob_gc_responses_threshold {
+                if let Some(oob_gc_threshold) = params.oob_gc_responses_threshold {
                     idle_counter = (idle_counter + 1) % oob_gc_threshold;
                     if idle_counter == 0 {
-                        ruby.gc_start();
+                        call_with_gvl(|_ruby| {
+                            ruby.gc_start();
+                        });
                     }
                 };
             }
             match receiver.recv_blocking() {
-                Ok(RequestJob::ProcessRequest(request)) => {
+                Ok(RequestJob::ProcessHttpRequest(request, app_proc)) => {
+                    self_ref.request_id.fetch_add(1, Ordering::Relaxed);
+                    self_ref.current_request_start.store(
+                        SystemTime::now()
+                            .duration_since(UNIX_EPOCH)
+                            .unwrap()
+                            .as_secs(),
+                        Ordering::Relaxed,
+                    );
+                    call_with_gvl(|_ruby| {
+                        request.process(&ruby, app_proc).ok();
+                    });
                     if terminated.load(Ordering::Relaxed) {
                         break;
                     }
+                }
+                Ok(RequestJob::ProcessGrpcRequest(request, app_proc)) => {
+                    self_ref.request_id.fetch_add(1, Ordering::Relaxed);
+                    self_ref.current_request_start.store(
+                        SystemTime::now()
+                            .duration_since(UNIX_EPOCH)
+                            .unwrap()
+                            .as_secs(),
+                        Ordering::Relaxed,
+                    );
                     call_with_gvl(|_ruby| {
-                        request.process(&ruby, server_class, app).ok();
-                    })
+                        request.process(&ruby, app_proc).ok();
+                    });
+                    if terminated.load(Ordering::Relaxed) {
+                        break;
+                    }
                 }
                 Ok(RequestJob::Shutdown) => {
-                    debug!("Shutting down thread worker");
                     break;
                 }
                 Err(_) => {

data/crates/itsi_server/src/server/types.rs

@@ -0,0 +1,43 @@
+use std::convert::Infallible;
+
+use bytes::Bytes;
+use http::{Request, Response};
+use http_body_util::combinators::BoxBody;
+use hyper::body::Incoming;
+
+pub type HttpResponse = Response<BoxBody<Bytes, Infallible>>;
+pub type HttpRequest = Request<Incoming>;
+
+pub trait RequestExt {
+    fn content_type(&self) -> Option<&str>;
+    fn accept(&self) -> Option<&str>;
+    fn header(&self, header_name: &str) -> Option<&str>;
+    fn query_param(&self, query_name: &str) -> Option<&str>;
+}
+
+impl RequestExt for HttpRequest {
+    fn content_type(&self) -> Option<&str> {
+        self.headers()
+            .get("content-type")
+            .map(|hv| hv.to_str().unwrap_or(""))
+    }
+
+    fn accept(&self) -> Option<&str> {
+        self.headers()
+            .get("accept")
+            .map(|hv| hv.to_str().unwrap_or(""))
+    }
+
+    fn header(&self, header_name: &str) -> Option<&str> {
+        self.headers()
+            .get(header_name)
+            .map(|hv| hv.to_str().unwrap_or(""))
+    }
+
+    fn query_param(&self, query_name: &str) -> Option<&str> {
+        self.uri()
+            .query()
+            .and_then(|query| query.split('&').find(|param| param.starts_with(query_name)))
+            .map(|param| param.split('=').nth(1).unwrap_or(""))
+    }
+}

data/crates/itsi_server/test.md

@@ -0,0 +1,14 @@
+---
+title: Itsi Server Test Page
+type: docs
+prev: /
+next: crates/itsi_server/src/ruby_types/readme/
+---
+
+A simple demo page.
+
+
+
+## Hello World
+
+This is a test

data/crates/itsi_tracing/Cargo.toml

@@ -14,3 +14,4 @@ tracing-subscriber = { version = "0.3.19", features = [
 ] }
 tracing-attributes = "0.1"
 atty = "0.2.14"
+tracing-appender = "0.2.3"