From 2e165ae82eed1dc62f1f4c68e45440c143c7c8ef Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 10 Aug 2018 17:49:45 +0300 Subject: logging --- codeless/server/.gitignore | 1 - codeless/server/Cargo.toml | 4 +- codeless/server/src/dispatch.rs | 4 +- codeless/server/src/io.rs | 55 +++++++------- codeless/server/src/main.rs | 126 +++++++++++++++++++++++++++---- codeless/server/target/.rustc_info.json | 1 - codeless/server/target/debug/.cargo-lock | 0 codeless/server/target/debug/libm.d | 1 - codeless/server/target/debug/libm.rmeta | 0 9 files changed, 145 insertions(+), 47 deletions(-) delete mode 100644 codeless/server/.gitignore delete mode 100644 codeless/server/target/.rustc_info.json delete mode 100644 codeless/server/target/debug/.cargo-lock delete mode 100644 codeless/server/target/debug/libm.d delete mode 100644 codeless/server/target/debug/libm.rmeta (limited to 'codeless/server') diff --git a/codeless/server/.gitignore b/codeless/server/.gitignore deleted file mode 100644 index 5a50b7f98..000000000 --- a/codeless/server/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/* diff --git a/codeless/server/Cargo.toml b/codeless/server/Cargo.toml index 4c3dd345c..f5c32b878 100644 --- a/codeless/server/Cargo.toml +++ b/codeless/server/Cargo.toml @@ -2,7 +2,6 @@ name = "m" version = "0.1.0" authors = ["Aleksey Kladov "] -[workspace] [dependencies] failure = "0.1.2" @@ -12,5 +11,8 @@ serde = "1.0.71" serde_derive = "1.0.71" drop_bomb = "0.1.0" crossbeam-channel = "0.2.4" +threadpool = "1.7.1" +flexi_logger = "0.9.0" +log = "0.4.3" libeditor = { path = "../../libeditor" } libanalysis = { path = "../../libanalysis" } diff --git a/codeless/server/src/dispatch.rs b/codeless/server/src/dispatch.rs index a9476acde..ee87fa6c3 100644 --- a/codeless/server/src/dispatch.rs +++ b/codeless/server/src/dispatch.rs @@ -24,8 +24,8 @@ impl Responder R::Params: DeserializeOwned, R::Result: Serialize, { - pub fn respond_with(self, io: &mut Io, f: impl FnOnce() -> Result) -> Result<()> { - match f() { + pub fn response(self, io: &mut Io, resp: Result) -> Result<()> { + match resp { Ok(res) => self.result(io, res)?, Err(e) => { self.error(io)?; diff --git a/codeless/server/src/io.rs b/codeless/server/src/io.rs index b84103d65..5eafc6942 100644 --- a/codeless/server/src/io.rs +++ b/codeless/server/src/io.rs @@ -49,16 +49,21 @@ impl MsgReceiver { match self.chan.recv() { Some(msg) => Ok(msg), None => { - self.thread - .take() - .ok_or_else(|| format_err!("MsgReceiver thread panicked"))? - .join() - .map_err(|_| format_err!("MsgReceiver thread panicked"))??; - bail!("client disconnected") + self.cleanup()?; + unreachable!() } } } + fn cleanup(&mut self) -> Result<()> { + self.thread + .take() + .ok_or_else(|| format_err!("MsgReceiver thread panicked"))? + .join() + .map_err(|_| format_err!("MsgReceiver thread panicked"))??; + bail!("client disconnected") + } + fn stop(self) -> Result<()> { // Can't really self.thread.join() here, b/c it might be // blocking on read @@ -68,7 +73,7 @@ impl MsgReceiver { struct MsgSender { chan: Sender, - thread: Option>>, + thread: thread::JoinHandle>, } impl MsgSender { @@ -76,28 +81,14 @@ impl MsgSender { self.chan.send(msg) } - fn stop(mut self) -> Result<()> { - if let Some(thread) = self.thread.take() { - thread.join() - .map_err(|_| format_err!("MsgSender thread panicked"))?? - } + fn stop(self) -> Result<()> { + drop(self.chan); + self.thread.join() + .map_err(|_| format_err!("MsgSender thread panicked"))??; Ok(()) } } -impl Drop for MsgSender { - fn drop(&mut self) { - if let Some(thread) = self.thread.take() { - let res = thread.join(); - if thread::panicking() { - drop(res) - } else { - res.unwrap().unwrap() - } - } - } -} - pub struct Io { receiver: MsgReceiver, sender: MsgSender, @@ -109,7 +100,7 @@ impl Io { let (tx, rx) = bounded(16); MsgSender { chan: tx, - thread: Some(thread::spawn(move || { + thread: thread::spawn(move || { let stdout = stdout(); let mut stdout = stdout.lock(); for msg in rx { @@ -126,7 +117,7 @@ impl Io { write_msg_text(&mut stdout, &text)?; } Ok(()) - })), + }), } }; let receiver = { @@ -155,6 +146,14 @@ impl Io { self.receiver.recv() } + pub fn receiver(&mut self) -> &mut Receiver { + &mut self.receiver.chan + } + + pub fn cleanup_receiver(&mut self) -> Result<()> { + self.receiver.cleanup() + } + pub fn stop(self) -> Result<()> { self.receiver.stop()?; self.sender.stop()?; @@ -190,10 +189,12 @@ fn read_msg_text(inp: &mut impl BufRead) -> Result> { buf.resize(size, 0); inp.read_exact(&mut buf)?; let buf = String::from_utf8(buf)?; + debug!("< {}", buf); Ok(Some(buf)) } fn write_msg_text(out: &mut impl Write, msg: &str) -> Result<()> { + debug!("> {}", msg); write!(out, "Content-Length: {}\r\n\r\n", msg.len())?; out.write_all(msg.as_bytes())?; out.flush()?; diff --git a/codeless/server/src/main.rs b/codeless/server/src/main.rs index 11b6b7067..92f6a400c 100644 --- a/codeless/server/src/main.rs +++ b/codeless/server/src/main.rs @@ -6,7 +6,12 @@ extern crate serde; extern crate serde_json; extern crate languageserver_types; extern crate drop_bomb; +#[macro_use] extern crate crossbeam_channel; +extern crate threadpool; +#[macro_use] +extern crate log; +extern crate flexi_logger; extern crate libeditor; extern crate libanalysis; @@ -16,16 +21,50 @@ mod req; mod dispatch; use languageserver_types::InitializeResult; +use threadpool::ThreadPool; +use crossbeam_channel::{bounded, Sender, Receiver}; +use flexi_logger::Logger; use libanalysis::WorldState; -use self::io::{Io, RawMsg}; + +use ::{ + io::{Io, RawMsg}, +}; pub type Result = ::std::result::Result; fn main() -> Result<()> { + Logger::with_env_or_str("m=trace") + .log_to_file() + .directory("log") + .start()?; + info!("starting server"); + match ::std::panic::catch_unwind(|| main_inner()) { + Ok(res) => { + info!("shutting down: {:?}", res); + res + } + Err(_) => { + error!("server panicked"); + bail!("server panicked") + }, + } +} + +fn main_inner() -> Result<()> { let mut io = Io::from_stdio(); - initialize(&mut io)?; - io.stop()?; - Ok(()) + let res = initialize(&mut io); + info!("shutting down IO..."); + let io_res = io.stop(); + info!("... IO is down"); + match (res, io_res) { + (Ok(()), Ok(())) => Ok(()), + (res, Ok(())) => res, + (Ok(()), io_res) => io_res, + (res, Err(io_err)) => { + error!("shutdown error: {:?}", io_err); + res + } + } } fn initialize(io: &mut Io) -> Result<()> { @@ -59,20 +98,69 @@ fn initialize(io: &mut Io) -> Result<()> { } } +type Thunk = Box FnBox<&'a mut Io, Result<()>>>; + fn initialized(io: &mut Io) -> Result<()> { - eprintln!("initialized"); - let world = WorldState::new(); + let mut world = WorldState::new(); + let mut pool = ThreadPool::new(4); + let (sender, receiver) = bounded::(16); + let res = main_loop(io, &mut world, &mut pool, sender, receiver.clone()); + info!("waiting for background jobs to finish..."); + receiver.for_each(drop); + info!("...background jobs have finished"); + res +} + +fn main_loop( + io: &mut Io, + world: &mut WorldState, + pool: &mut ThreadPool, + sender: Sender, + receiver: Receiver, +) -> Result<()> { + info!("server initialized, serving requests"); loop { - match io.recv()? { + enum Event { + Msg(RawMsg), + Thunk(Thunk), + ReceiverDead, + } + + let event = select! { + recv(io.receiver(), msg) => match msg { + Some(msg) => Event::Msg(msg), + None => Event::ReceiverDead, + }, + recv(receiver, thunk) => Event::Thunk(thunk.unwrap()), + }; + + let msg = match event { + Event::ReceiverDead => { + io.cleanup_receiver()?; + unreachable!(); + } + Event::Thunk(thunk) => { + thunk.call_box(io)?; + continue; + } + Event::Msg(msg) => msg, + }; + + match msg { RawMsg::Request(req) => { - let world = world.snapshot(); if let Some((params, resp)) = dispatch::expect::(io, req)? { - resp.respond_with(io, || { - let path = params.text_document.uri.to_file_path() - .map_err(|()| format_err!("invalid path"))?; - let file = world.file_syntax(&path)?; - Ok(libeditor::syntax_tree(&file)) - })? + let world = world.snapshot(); + let sender = sender.clone(); + pool.execute(move || { + let res: Result = (|| { + let path = params.text_document.uri.to_file_path() + .map_err(|()| format_err!("invalid path"))?; + let file = world.file_syntax(&path)?; + Ok(libeditor::syntax_tree(&file)) + })(); + + sender.send(Box::new(|io: &mut Io| resp.response(io, res))) + }); } } msg => { @@ -82,3 +170,13 @@ fn initialized(io: &mut Io) -> Result<()> { } } + +trait FnBox: Send { + fn call_box(self: Box, a: A) -> R; +} + +impl R + Send> FnBox for F { + fn call_box(self: Box, a: A) -> R { + (*self)(a) + } +} diff --git a/codeless/server/target/.rustc_info.json b/codeless/server/target/.rustc_info.json deleted file mode 100644 index a37ac2011..000000000 --- a/codeless/server/target/.rustc_info.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc_fingerprint":11898242945176772229,"outputs":{"15337506775154344876":["___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/matklad/.rustup/toolchains/stable-x86_64-unknown-linux-gnu\ndebug_assertions\nproc_macro\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\nunix\n",""],"1617349019360157463":["___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/matklad/.rustup/toolchains/stable-x86_64-unknown-linux-gnu\ndebug_assertions\nproc_macro\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\nunix\n",""],"1164083562126845933":["rustc 1.28.0 (9634041f0 2018-07-30)\nbinary: rustc\ncommit-hash: 9634041f0e8c0f3191d2867311276f19d0a42564\ncommit-date: 2018-07-30\nhost: x86_64-unknown-linux-gnu\nrelease: 1.28.0\nLLVM version: 6.0\n",""]}} \ No newline at end of file diff --git a/codeless/server/target/debug/.cargo-lock b/codeless/server/target/debug/.cargo-lock deleted file mode 100644 index e69de29bb..000000000 diff --git a/codeless/server/target/debug/libm.d b/codeless/server/target/debug/libm.d deleted file mode 100644 index 04d8bb9ed..000000000 --- a/codeless/server/target/debug/libm.d +++ /dev/null @@ -1 +0,0 @@ -/home/matklad/projects/libsyntax2/codeless/server/target/debug/libm.rmeta: /home/matklad/projects/libsyntax2/codeless/server/src/caps.rs /home/matklad/projects/libsyntax2/codeless/server/src/dispatch.rs /home/matklad/projects/libsyntax2/codeless/server/src/io.rs /home/matklad/projects/libsyntax2/codeless/server/src/main.rs /home/matklad/projects/libsyntax2/codeless/server/src/req.rs /home/matklad/projects/libsyntax2/libanalysis/src/lib.rs /home/matklad/projects/libsyntax2/libeditor/src/extend_selection.rs /home/matklad/projects/libsyntax2/libeditor/src/lib.rs /home/matklad/projects/libsyntax2/src/algo/mod.rs /home/matklad/projects/libsyntax2/src/algo/walk.rs /home/matklad/projects/libsyntax2/src/ast/generated.rs /home/matklad/projects/libsyntax2/src/ast/mod.rs /home/matklad/projects/libsyntax2/src/grammar/attributes.rs /home/matklad/projects/libsyntax2/src/grammar/expressions/atom.rs /home/matklad/projects/libsyntax2/src/grammar/expressions/mod.rs /home/matklad/projects/libsyntax2/src/grammar/items/consts.rs /home/matklad/projects/libsyntax2/src/grammar/items/mod.rs /home/matklad/projects/libsyntax2/src/grammar/items/structs.rs /home/matklad/projects/libsyntax2/src/grammar/items/traits.rs /home/matklad/projects/libsyntax2/src/grammar/items/use_item.rs /home/matklad/projects/libsyntax2/src/grammar/mod.rs /home/matklad/projects/libsyntax2/src/grammar/params.rs /home/matklad/projects/libsyntax2/src/grammar/paths.rs /home/matklad/projects/libsyntax2/src/grammar/patterns.rs /home/matklad/projects/libsyntax2/src/grammar/type_args.rs /home/matklad/projects/libsyntax2/src/grammar/type_params.rs /home/matklad/projects/libsyntax2/src/grammar/types.rs /home/matklad/projects/libsyntax2/src/lexer/classes.rs /home/matklad/projects/libsyntax2/src/lexer/comments.rs /home/matklad/projects/libsyntax2/src/lexer/mod.rs /home/matklad/projects/libsyntax2/src/lexer/numbers.rs /home/matklad/projects/libsyntax2/src/lexer/ptr.rs /home/matklad/projects/libsyntax2/src/lexer/strings.rs /home/matklad/projects/libsyntax2/src/lib.rs /home/matklad/projects/libsyntax2/src/parser_api.rs /home/matklad/projects/libsyntax2/src/parser_impl/event.rs /home/matklad/projects/libsyntax2/src/parser_impl/input.rs /home/matklad/projects/libsyntax2/src/parser_impl/mod.rs /home/matklad/projects/libsyntax2/src/smol_str.rs /home/matklad/projects/libsyntax2/src/syntax_kinds/generated.rs /home/matklad/projects/libsyntax2/src/syntax_kinds/mod.rs /home/matklad/projects/libsyntax2/src/utils.rs /home/matklad/projects/libsyntax2/src/yellow/builder.rs /home/matklad/projects/libsyntax2/src/yellow/green.rs /home/matklad/projects/libsyntax2/src/yellow/mod.rs /home/matklad/projects/libsyntax2/src/yellow/red.rs /home/matklad/projects/libsyntax2/src/yellow/syntax.rs diff --git a/codeless/server/target/debug/libm.rmeta b/codeless/server/target/debug/libm.rmeta deleted file mode 100644 index e69de29bb..000000000 -- cgit v1.2.3