diff options
| author | Kunal Mohan <kunalmohan99@gmail.com> | 2021-02-13 13:33:32 +0530 |
|---|---|---|
| committer | Kunal Mohan <kunalmohan99@gmail.com> | 2021-05-04 20:47:49 +0530 |
| commit | 2943dc7b3bf138b94a9b2685fc1b80ee9d2d1ec4 (patch) | |
| tree | eae7726fc953e0462948430b8417ebab20f855cc /src/common | |
| parent | undo some changes (diff) | |
| download | sl0ppij-2943dc7b3bf138b94a9b2685fc1b80ee9d2d1ec4.tar.gz sl0ppij-2943dc7b3bf138b94a9b2685fc1b80ee9d2d1ec4.tar.xz sl0ppij-2943dc7b3bf138b94a9b2685fc1b80ee9d2d1ec4.zip | |
Got things working! But we are loosing data in transmission :( PS: There are debug logs in there
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/mod.rs | 14 | ||||
| -rw-r--r-- | src/common/pty_bus.rs | 1 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/common/mod.rs b/src/common/mod.rs index c737a788..62d7e702 100644 --- a/src/common/mod.rs +++ b/src/common/mod.rs @@ -141,6 +141,7 @@ impl IpcSenderWithContext { } pub fn send(&mut self, msg: ApiCommand) -> std::io::Result<()> { + eprintln!("IpcSender sent {:?}", msg); let command = bincode::serialize(&(self.err_ctx, msg)).unwrap(); self.sender.write_all(&command) } @@ -200,7 +201,7 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs, config: Config) { SenderWithContext::new(SenderType::Sender(send_plugin_instructions)); let (send_app_instructions, receive_app_instructions): SyncChannelWithContext<AppInstruction> = - mpsc::sync_channel(0); + mpsc::sync_channel(500); let send_app_instructions = SenderWithContext::new(SenderType::SyncSender(send_app_instructions)); @@ -560,7 +561,7 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs, config: Config) { break; } AppInstruction::Error(backtrace) => { - let _ = send_server_instructions.send(ApiCommand::Quit); + //let _ = send_server_instructions.send(ApiCommand::Quit); //let _ = ipc_thread.join(); //IpcSenderWithContext::new().send(ApiCommand::Quit); let _ = send_screen_instructions.send(ScreenInstruction::Quit); @@ -570,10 +571,11 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs, config: Config) { os_input.unset_raw_mode(0); let goto_start_of_last_line = format!("\u{1b}[{};{}H", full_screen_ws.rows, 1); let error = format!("{}\n{}", goto_start_of_last_line, backtrace); - let _ = os_input - .get_stdout_writer() - .write(error.as_bytes()) - .unwrap(); + //let _ = os_input + // .get_stdout_writer() + // .write(error.as_bytes()) + // .unwrap(); + eprintln!("{}", error); std::process::exit(1); } AppInstruction::ToScreen(instruction) => { diff --git a/src/common/pty_bus.rs b/src/common/pty_bus.rs index 3c5183e9..840d11e4 100644 --- a/src/common/pty_bus.rs +++ b/src/common/pty_bus.rs @@ -197,6 +197,7 @@ fn stream_terminal_bytes(pid: RawFd, os_input: Box<dyn OsApi>, debug: bool) -> J let mut err_ctx = OPENCALLS.with(|ctx| *ctx.borrow()); task::spawn({ async move { + eprintln!("New task spawned"); err_ctx.add_call(ContextType::AsyncTask); let mut send_server_instructions = IpcSenderWithContext::new(); send_server_instructions.update(err_ctx); |
