github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

map: wrapped App in a Mutex and initialized App objects in main()

Browse Source
This commit is contained in:
lunar-mining
2022-02-05 09:52:41 +01:00
parent 7c84dcb8f8
commit 220e4c9adc
5 changed files with 92 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
bin/map/src/app.rs
View File

@@ -1,63 +1,18 @@
use crate::{id_list::IdList, info_list::InfoList, node_info::NodeInfo};
//use async_std::sync::Mutex;
//use smol::Timer;
//use std::{collections::HashMap, time::Duration};
// make a structure to be able to modify and read them
// protect using a mutex
// arc reference
#[derive(Clone)]
pub struct App {
pub id_list: IdList,
pub info_list: InfoList,
}
impl App {
pub fn new() -> App {
let infos = vec![
NodeInfo {
id: "0385048034sodisofjhosd1111q3434".to_string(),
connections: 10,
is_active: true,
last_message: "hey how are you?".to_string(),
},
NodeInfo {
id: "09w30we9wsnfksdfkdjflsjkdfjdfsd".to_string(),
connections: 5,
is_active: false,
last_message: "lmao".to_string(),
},
NodeInfo {
id: "038043325alsdlasjfrsdfsdfsdjsdf".to_string(),
connections: 7,
is_active: true,
last_message: "gm".to_string(),
},
NodeInfo {
id: "04985034953ldflsdjflsdjflsdjfii".to_string(),
connections: 2,
is_active: true,
last_message: "hihi".to_string(),
},
NodeInfo {
id: "09850249352asdjapsdikalskasdkas".to_string(),
connections: 10,
is_active: true,
last_message: "wtf".to_string(),
},
];
let info_list = InfoList::new(infos.clone());
let ids = vec![
infos[0].id.clone(),
infos[1].id.clone(),
infos[2].id.clone(),
infos[3].id.clone(),
infos[4].id.clone(),
];
let id_list = IdList::new(ids);
pub fn new(id_list: IdList, info_list: InfoList) -> App {
//let infos = Vec::new();
//let ids = Vec::new();
@@ -89,8 +44,8 @@ impl App {
}
}
impl Default for App {
fn default() -> Self {
Self::new()
}
}
//impl Default for App {
// fn default() -> Self {
// Self::new()
// }
//}

3
bin/map/src/id_list.rs
View File

@@ -1,4 +1,5 @@
//use std::collections::HashMap;
//TODO: made node_id into a hashset across project
//use std::collections::HashSet
use tui::widgets::ListState;
#[derive(Clone)]

5
bin/map/src/info_list.rs
View File

@@ -1,6 +1,5 @@
use crate::node_info::NodeInfo;
#[derive(Clone)]
pub struct InfoList {
pub index: usize,
pub infos: Vec<NodeInfo>,
@@ -13,11 +12,11 @@ impl InfoList {
InfoList { index, infos }
}
pub fn next(&mut self) {
pub async fn next(&mut self) {
self.index = (self.index + 1) % self.infos.len();
}
pub fn previous(&mut self) {
pub async fn previous(&mut self) {
if self.index > 0 {
self.index -= 1;
} else {

84
bin/map/src/main.rs
View File

@@ -1,7 +1,3 @@
// select each connection and show log of traffic
// use rpc to get some info from the ircd network
// ircd::logger keeps track of network info
// map rpc polls logger for info about nodes, etc
use darkfi::{
error::{Error, Result},
rpc::{jsonrpc, jsonrpc::JsonResult},
@@ -20,7 +16,7 @@ use tui::{
Terminal,
};
use map::{node_info::NodeInfo, ui, App};
use map::{id_list::IdList, info_list::InfoList, node_info::NodeInfo, ui, App};
struct Map {
url: String,
@@ -78,7 +74,52 @@ async fn main() -> Result<()> {
terminal.clear()?;
let app = Arc::new(Mutex::new(App::new()));
let infos = vec![
NodeInfo {
id: "0385048034sodisofjhosd1111q3434".to_string(),
connections: 10,
is_active: true,
last_message: "hey how are you?".to_string(),
},
NodeInfo {
id: "09w30we9wsnfksdfkdjflsjkdfjdfsd".to_string(),
connections: 5,
is_active: false,
last_message: "lmao".to_string(),
},
NodeInfo {
id: "038043325alsdlasjfrsdfsdfsdjsdf".to_string(),
connections: 7,
is_active: true,
last_message: "gm".to_string(),
},
NodeInfo {
id: "04985034953ldflsdjflsdjflsdjfii".to_string(),
connections: 2,
is_active: true,
last_message: "hihi".to_string(),
},
NodeInfo {
id: "09850249352asdjapsdikalskasdkas".to_string(),
connections: 10,
is_active: true,
last_message: "wtf".to_string(),
},
];
let info_list = InfoList::new(infos.clone());
let ids = vec![
infos[0].id.clone(),
infos[1].id.clone(),
infos[2].id.clone(),
infos[3].id.clone(),
infos[4].id.clone(),
];
let id_list = IdList::new(ids);
let app = Arc::new(Mutex::new(App::new(id_list, info_list)));
let nthreads = num_cpus::get();
let (signal, shutdown) = async_channel::unbounded::<()>();
@@ -91,8 +132,8 @@ async fn main() -> Result<()> {
// Run the main future on the current thread.
.finish(|| {
smol::future::block_on(async move {
listen(ex2.clone(), app.lock().await.clone()).await?;
run_app(&mut terminal, app.lock().await.clone()).await?;
listen(ex2.clone(), app.clone()).await?;
run_app(&mut terminal, app.clone()).await?;
drop(signal);
Ok::<(), darkfi::Error>(())
})
@@ -101,7 +142,7 @@ async fn main() -> Result<()> {
result
}
async fn listen(ex: Arc<Executor<'_>>, app: App) -> Result<()> {
async fn listen(ex: Arc<Executor<'_>>, app: Arc<Mutex<App>>) -> Result<()> {
let client = Map::new("tcp://127.0.0.1:8000".to_string());
ex.spawn(poll(client, app)).detach();
@@ -109,7 +150,7 @@ async fn listen(ex: Arc<Executor<'_>>, app: App) -> Result<()> {
Ok(())
}
async fn poll(client: Map, app: App) -> Result<()> {
async fn poll(client: Map, app: Arc<Mutex<App>>) -> Result<()> {
loop {
let reply = client.get_info().await?;
@@ -127,7 +168,7 @@ async fn poll(client: Map, app: App) -> Result<()> {
last_message: node3["message"].to_string(),
}];
app.clone().update(infos).await;
//app.update(infos).await;
} else {
// TODO: error handling
println!("Reply is an error");
@@ -137,34 +178,35 @@ async fn poll(client: Map, app: App) -> Result<()> {
}
}
async fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> io::Result<()> {
async fn run_app<B: Backend>(terminal: &mut Terminal<B>, app: Arc<Mutex<App>>) -> io::Result<()> {
let mut asi = async_stdin();
terminal.clear()?;
app.id_list.state.select(Some(0));
app.lock().await.id_list.state.select(Some(0));
app.info_list.index = 0;
app.lock().await.info_list.index = 0;
// acquire the mutex
// let mut app = app.lock();
loop {
terminal.draw(|f| ui::ui(f, &mut app))?;
terminal.draw(|f| {
ui::ui(f, app.clone());
})?;
for k in asi.by_ref().keys() {
match k.unwrap() {
Key::Char('q') => {
terminal.clear()?;
return Ok(())
return Ok(());
}
Key::Char('j') => {
app.id_list.next();
app.info_list.next();
app.lock().await.id_list.next();
app.lock().await.info_list.next();
}
Key::Char('k') => {
app.id_list.previous();
app.info_list.previous();
app.lock().await.id_list.previous();
app.lock().await.info_list.previous();
}
_ => (),
}

27
bin/map/src/ui.rs
View File

@@ -1,4 +1,5 @@
use crate::app::App;
use async_std::sync::{Arc, Mutex};
use tui::{
backend::Backend,
layout::{Constraint, Direction, Layout, Rect},
@@ -8,7 +9,7 @@ use tui::{
Frame,
};
pub fn ui<B: Backend>(f: &mut Frame<B>, app: &mut App) {
pub async fn ui<B: Backend>(f: &mut Frame<'_, B>, app: Arc<Mutex<App>>) {
let slice = Layout::default()
.direction(Direction::Horizontal)
.margin(2)
@@ -16,6 +17,8 @@ pub fn ui<B: Backend>(f: &mut Frame<B>, app: &mut App) {
.split(f.size());
let nodes: Vec<ListItem> = app
.lock()
.await
.id_list
.node_id
.iter()
@@ -29,18 +32,24 @@ pub fn ui<B: Backend>(f: &mut Frame<B>, app: &mut App) {
.block(Block::default().borders(Borders::ALL))
.highlight_style(Style::default().fg(Color::LightCyan).add_modifier(Modifier::BOLD));
f.render_stateful_widget(nodes, slice[0], &mut app.id_list.state);
f.render_stateful_widget(nodes, slice[0], &mut app.lock().await.id_list.state);
let index = app.info_list.index;
let index = app.lock().await.info_list.index;
render_info(app, f, index, slice);
render_info(app, f, index, slice).await;
}
fn render_info<B: Backend>(app: &mut App, f: &mut Frame<B>, index: usize, slice: Vec<Rect>) {
let id = &app.info_list.infos[index].id;
let connections = app.info_list.infos[index].connections;
let is_active = app.info_list.infos[index].is_active;
let message = &app.info_list.infos[index].last_message;
async fn render_info<B: Backend>(
app: Arc<Mutex<App>>,
f: &mut Frame<'_, B>,
index: usize,
slice: Vec<Rect>,
) {
let info = &app.lock().await.info_list.infos;
let id = &info[index].id;
let connections = info[index].connections;
let is_active = info[index].is_active;
let message = &info[index].last_message;
let span = vec![
Spans::from(format!("NodeId: {}", id)),
Spans::from(format!("Number of connections: {}", connections)),