From 2d74a44a8974b0b689e71df0f7c313c21dfe8876 Mon Sep 17 00:00:00 2001 From: Vihaan Jim Date: Tue, 8 Aug 2023 18:08:25 -0400 Subject: [PATCH] Add almost working server/client This creates: 1) An `xtask' command that allows someone to compile individual apps without compiling the entire image (note that this is required because xtask generates files that contain gam context names, and if you just do a regular `cargo build' building the app will fail) 2) A python file app_server.py that acts as a server to give the app-loader a list of the apps and actually send it the 3) A basic UX that allows app-loader to set the server, get the list of apps, and load apps. Currently, this mostly works, except that there is some random `ShareViolation' when the app-loader loads the app. --- Cargo.lock | 2 + apps/app-loader/Cargo.toml | 3 + apps/app-loader/src/api.rs | 136 ++++++++++++++++++++++++++++------ apps/app-loader/src/main.rs | 37 +++------ apps/app-loader/src/spawn.bin | Bin 0 -> 23692 bytes tools/app_server.py | 64 ++++++++++++++++ xtask/src/builder.rs | 20 ++++- xtask/src/main.rs | 5 ++ 8 files changed, 214 insertions(+), 53 deletions(-) create mode 100644 apps/app-loader/src/spawn.bin create mode 100644 tools/app_server.py diff --git a/Cargo.lock b/Cargo.lock index 92ccf0781..4dfe06d84 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -110,9 +110,11 @@ dependencies = [ "graphics-server", "locales", "log", + "modals", "num-derive", "num-traits", "rkyv", + "ureq", "xous", "xous-api-log", "xous-api-names", diff --git a/apps/app-loader/Cargo.toml b/apps/app-loader/Cargo.toml index 51f9f3093..62a11388e 100644 --- a/apps/app-loader/Cargo.toml +++ b/apps/app-loader/Cargo.toml @@ -14,6 +14,7 @@ log = "0.4.14" xous-names = { package = "xous-api-names", version = "0.9.37" } gam = { path = "../../services/gam" } graphics-server = { path = "../../services/graphics-server" } +modals = { path = "../../services/modals" } ticktimer-server = { package = "xous-api-ticktimer", version = "0.9.44" } locales = { path = "../../locales" } @@ -21,3 +22,5 @@ num-derive = {version = "0.3.3", default-features = false} num-traits = {version = "0.2.14", default-features = false} rkyv = {version = "0.4.3", features = ["const_generics"], default-features = false} + +ureq = { version = "2.5.0", features = ["json"] } \ No newline at end of file diff --git a/apps/app-loader/src/api.rs b/apps/app-loader/src/api.rs index 083a9834c..84e9fdccd 100644 --- a/apps/app-loader/src/api.rs +++ b/apps/app-loader/src/api.rs @@ -1,15 +1,20 @@ -use gam::{Gam, MenuItem, UxRegistration, menu_matic, APP_NAME_APP_LOADER, APP_MENU_0_APP_LOADER, MenuMatic}; -use xous_ipc::Buffer; +use std::io::Read; +use gam::{Gam, MenuItem, UxRegistration, menu_matic, APP_NAME_APP_LOADER, APP_MENU_0_APP_LOADER, MenuMatic, TextEntryPayload}; +use modals::Modals; +use xous::MemoryRange; use num_traits::ToPrimitive; use crate::SERVER_NAME_APP_LOADER; pub(crate) struct AppLoader { gam: Gam, + modals: Modals, auth: [u32; 4], ticktimer: ticktimer_server::Ticktimer, menu: MenuMatic, conn: xous::CID, apps: Vec>, + possible_apps: Vec>, + server: Option, } impl AppLoader { @@ -30,6 +35,8 @@ impl AppLoader { rawkeys_id: None }).expect("Couldn't register").expect("Didn't get an auth token"); + let modals = Modals::new(xns).expect("Couldn't get modals"); + // a connection to the server let conn = xns.request_connection_blocking(SERVER_NAME_APP_LOADER).expect("Couldn't connect to server"); @@ -37,27 +44,109 @@ impl AppLoader { let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer"); // the menu - let menu = menu_matic(Vec::new(), APP_MENU_0_APP_LOADER, Some(xous::create_server().unwrap())).expect("Couldn't create menu"); + let set_server_item = MenuItem{ name: xous_ipc::String::from_str("Set Server"), + action_conn: Some(conn), + action_opcode: Opcode::SetServer.to_u32().unwrap(), + action_payload: gam::MenuPayload::Scalar([0, 0, 0, 0]), + close_on_select: true }; + let menu = menu_matic(vec![set_server_item], APP_MENU_0_APP_LOADER, Some(xous::create_server().unwrap())).expect("Couldn't create menu"); - AppLoader{ gam, auth, conn, ticktimer, menu, apps: Vec::new() } + AppLoader{ gam, modals, auth, conn, ticktimer, menu, apps: Vec::new(), possible_apps: Vec::new(), server: None } } - pub(crate) fn add_app(&mut self, name: &str) { - let buf = Buffer::into_buf(LoadAppRequest { name: xous_ipc::String::from_str(name) }) - .expect("Couldn't create buffer"); - buf.send(self.conn, - Opcode::LoadApp.to_u32().unwrap()).expect("Couldn't send message"); + pub(crate) fn add_app(&mut self, index: usize) { + let name = self.possible_apps[index]; + + // load the app from the server + let response = ureq::get(&format!("{}/{}", self.server.as_ref().expect("AddApp was somehow called without a server!"), name)) + .call().expect("Couldn't make request"); + + let len = response.header("Content-Length").expect("No Content-Length header") + .parse::().expect("Couldn't parse Content-Length header"); + + let mut app_file = Vec::with_capacity(len); + response.into_reader() + .read_to_end(&mut app_file).expect("Couldn't read"); + let app_file_slice = app_file.as_slice(); + + let memory = unsafe { MemoryRange::new((app_file_slice.as_ptr() as usize) & !0xFFF, + len + if len & 0xFFF == 0 { 0 } else { 0x1000 - (len & 0xFFF) }).unwrap() }; + + ////////////////////// + // The loading part // + ////////////////////// + + // create the spawn process + let stub = include_bytes!("spawn.bin"); + let args = xous::ProcessArgs::new(stub, xous::MemoryAddress::new(0x2050_1000).unwrap(), xous::MemoryAddress::new(0x2050_1000).unwrap()); + let spawn = xous::create_process(args).expect("Couldn't create spawn process"); + log::info!("Spawn PID: {}, Spawn CID: {}", spawn.pid, spawn.cid); + + // perform a ping to make sure that spawn is running + let result = xous::send_message( + spawn.cid, + xous::Message::new_blocking_scalar(2, 1, 2, 3, 4), + ) + .unwrap(); + assert_eq!(xous::Result::Scalar1(2), result); + + // load the app from the binary file + xous::send_message(spawn.cid, xous::Message::new_lend(1, memory, None, None)).expect("Couldn't send a message to spawn"); + + ////////////////////// + // back to graphics // + ////////////////////// // add its name to GAM - self.gam.register_name(name, self.auth).expect("Couldn't register name"); + self.gam.register_name(name.to_str(), self.auth).expect("Couldn't register name"); // add it to the menu - self.menu.add_item(MenuItem { name: xous_ipc::String::from_str(name), - action_conn: Some(self.conn), - action_opcode: Opcode::DispatchApp.to_u32().unwrap(), - action_payload: gam::MenuPayload::Scalar([self.apps.len().try_into().unwrap(), 0, 0, 0]), - close_on_select: true }); - self.apps.push(xous_ipc::String::from_str(name)); + self.menu.insert_item(MenuItem { name, + action_conn: Some(self.conn), + action_opcode: Opcode::DispatchApp.to_u32().unwrap(), + action_payload: gam::MenuPayload::Scalar([self.apps.len().try_into().unwrap(), 0, 0, 0]), + close_on_select: true }, 0); + self.apps.push(name); + + log::info!("Added app `{}'!", name); + + self.redraw(); + } + + pub(crate) fn set_server(&mut self) { + let payload = self.modals.alert_builder("Server IP Address:Port") + // .field(None, Some(|payload: TextEntryPayload| if payload.as_str().trim_start_matches("https://").trim_start_matches("http://").chars().filter(|c| *c == ':').count() == 1 { None } else { Some(xous_ipc::String::from_str("Port is not specified")) })) + .field(None, None) + .build() + .ok(); + + if self.server.is_none() && payload.is_some() { + self.menu.insert_item(MenuItem { name: xous_ipc::String::from_str("Reload App List"), + action_conn: Some(self.conn), + action_opcode: Opcode::ReloadAppList.to_u32().unwrap(), + action_payload: gam::MenuPayload::Scalar([0, 0, 0, 0]), + close_on_select: true }, 0); + } + + self.server = payload.and_then(|p| Some(p.first().as_str().to_string())); + } + + pub(crate) fn reload_app_list(&mut self) { + // without a path, the server responds with a JSON list of strings representing the list of app names + self.possible_apps = ureq::get(&self.server.as_ref().expect("ReloadAppList was somehow called without a server!")) + .call().expect("Couldn't make request") + .into_json::>().expect("Couldn't convert into JSON") + .iter() + .map(|s| xous_ipc::String::<64>::from_str(&s)) + .collect(); + + for (i, app) in self.possible_apps.iter().enumerate() { + self.menu.insert_item(MenuItem { name: xous_ipc::String::from_str("Add ".to_owned()+app.to_str()), + action_conn: Some(self.conn), + action_opcode: Opcode::AddApp.to_u32().unwrap(), + action_payload: gam::MenuPayload::Scalar([i.try_into().unwrap(), 0, 0, 0]), + close_on_select: true }, 0); + } } pub(crate) fn dispatch_app(&self, index: usize) { @@ -85,8 +174,14 @@ impl AppLoader { #[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive)] pub(crate) enum Opcode { - /// to load an app into ram - LoadApp, + /// set the server + SetServer, + + /// get a list of apps from the server + ReloadAppList, + + /// load an app and add it to the menu + AddApp, /// dispatch the app DispatchApp, @@ -94,8 +189,3 @@ pub(crate) enum Opcode { /// Redraw the UI Redraw } - -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] -pub(crate) struct LoadAppRequest { - pub name: xous_ipc::String<64> -} diff --git a/apps/app-loader/src/main.rs b/apps/app-loader/src/main.rs index 47c09aac8..f1f02b934 100644 --- a/apps/app-loader/src/main.rs +++ b/apps/app-loader/src/main.rs @@ -1,7 +1,6 @@ mod api; use api::*; use num_traits::FromPrimitive; -use xous_ipc::Buffer; const SERVER_NAME_APP_LOADER: &str = "_App Loader_"; @@ -15,37 +14,19 @@ fn main() -> ! { // start off by adding hello world let mut app_loader = AppLoader::new(&xns, &sid); - app_loader.add_app("Hello"); loop { let msg = xous::receive_message(sid).unwrap(); match FromPrimitive::from_usize(msg.body.id()).expect("Couldn't load message") { - Opcode::LoadApp => { - let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - let load_app_req = buffer.to_original::().unwrap(); - - // create the spawn process - let stub = include_bytes!("../../../target/riscv32imac-unknown-xous-elf/debug/spawn.bin"); - let args = xous::ProcessArgs::new(stub, xous::MemoryAddress::new(0x2050_1000).unwrap(), xous::MemoryAddress::new(0x2050_1000).unwrap()); - let spawn = xous::create_process(args).expect("Couldn't create spawn process"); - log::info!("Spawn PID: {}, Spawn CID: {}", spawn.pid, spawn.cid); - - // perform a ping to make sure that spawn is running - let result = xous::send_message( - spawn.cid, - xous::Message::new_blocking_scalar(2, 1, 2, 3, 4), - ) - .unwrap(); - assert_eq!(xous::Result::Scalar1(2), result); - - // load the app from the binary file - let bin = include_bytes!("../../../target/riscv32imac-unknown-xous-elf/debug/hello"); - let bin_len = bin.len(); - let bin_loc = bin.as_ptr() as usize; - let buf = unsafe { xous::MemoryRange::new(bin_loc & !0xFFF, bin_len + if bin_len & 0xFFF == 0 { 0 } else {0x1000 - (bin_len & 0xFFF)}).expect("Couldn't create a buffer from the segment") }; - xous::send_message(spawn.cid, xous::Message::new_lend(1, buf, None, None)).expect("Couldn't send a message to spawn"); - - log::info!("Loaded app `{}'!", load_app_req.name); + Opcode::SetServer => { + app_loader.set_server(); + }, + Opcode::ReloadAppList => { + app_loader.reload_app_list(); + }, + Opcode::AddApp => { + let index = msg.body.scalar_message().expect("Not a scalar").arg1; + app_loader.add_app(index); }, Opcode::DispatchApp => { let index = msg.body.scalar_message().expect("Not a scalar").arg1; diff --git a/apps/app-loader/src/spawn.bin b/apps/app-loader/src/spawn.bin new file mode 100644 index 0000000000000000000000000000000000000000..37b1ad9cbc16413ecb18e14c0556a0d5e67d249f GIT binary patch literal 23692 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 I3*z1X1=Pcwu>b%7 literal 0 HcmV?d00001 diff --git a/tools/app_server.py b/tools/app_server.py new file mode 100644 index 000000000..df2d96864 --- /dev/null +++ b/tools/app_server.py @@ -0,0 +1,64 @@ +#! /usr/bin/env python3 + +import argparse +import json +from http.server import BaseHTTPRequestHandler, HTTPServer +from urllib.parse import unquote + +class XousAppServer(BaseHTTPRequestHandler): + def __init__(self, profile, target, context_to_app, *args): + self.profile = profile + self.target = target + self.context_to_app = context_to_app + BaseHTTPRequestHandler.__init__(self, *args) + + def do_GET(self): + # an empty path should return a list of apps + path = self.path.split('/')[-1] + if path == '': + self.send_response(200) + self.send_header('Content-Type', 'application/json') + self.end_headers() + + l = json.dumps(list(self.context_to_app.keys())) + + self.wfile.write(l.encode()) + else: + name = self.context_to_app[unquote(path)] + with open('target/{}/{}/{}'.format(self.target, self.profile, name), 'rb') as f: + data = f.read() + self.send_response(200) + self.send_header('Content-Type', 'application/octet-stream') + self.send_header('Content-Length', str(len(data))) + self.end_headers() + + self.wfile.write(data) + +def main(): + parser = argparse.ArgumentParser(description="Xous App Server") + parser.add_argument('apps', metavar='APP', nargs='+', + help='Specifies which apps to serve') + parser.add_argument('-p', '--port', + help='Specifies the port that the server runs on', + required=True, type=int) + parser.add_argument('--profile', default="release", + help="Either debug or release depending on how the apps were compiled. Defaults to release") + parser.add_argument('--target', default="riscv32imac-unknown-xous-elf", + help="The target that the apps were compile to. Defaults to riscv32imac-unknown-xous-elf") + args = parser.parse_args() + + # get the GAM names for each of the apps + with open('apps/manifest.json', 'r') as f: + manifest = json.loads(f.read()) + + context_to_app = {} + + for app in args.apps: + context_name = manifest[app]['context_name'] + context_to_app[context_name] = app + + server = HTTPServer(('0.0.0.0', args.port), lambda *server_args: XousAppServer(args.profile, args.target, context_to_app, *server_args)) + server.serve_forever() + +if __name__ == "__main__": + main() diff --git a/xtask/src/builder.rs b/xtask/src/builder.rs index d517f205f..60b7e6caa 100644 --- a/xtask/src/builder.rs +++ b/xtask/src/builder.rs @@ -130,6 +130,8 @@ pub(crate) struct Builder { locale_stash: String, /// when set to true, hosted mode builds but does not run dry_run: bool, + /// when set to true, user selected packages are compiled but no image is created + no_image: bool, } impl Builder { @@ -154,6 +156,7 @@ impl Builder { locale_override: None, locale_stash: String::new(), dry_run: false, + no_image: false, } } /// Specify an alternate loader key, as a String that can encode a file name @@ -237,6 +240,14 @@ impl Builder { self.kernel = CrateSpec::Local("xous-kernel".to_string(), false); self } + pub fn target_precursor_no_image<'a>(&'a mut self, soc_version: &str) -> &'a mut Builder { + self.target = Some(crate::TARGET_TRIPLE_RISCV32.to_string()); + self.stream = BuildStream::Release; + self.utra_target = format!("precursor-{}", soc_version).to_string(); + self.run_svd2repl = false; + self.no_image = true; + self + } /// Configure for ARM targets pub fn target_arm(&mut self) -> &mut Builder { @@ -597,8 +608,13 @@ impl Builder { false )?; - // ------ either create an image, or launch hosted mode ------ - if self.target.is_none() { // hosted mode doesn't specify a cross-compilation target! + // ------ either stop here, create an image, or launch hosted mode ------ + if self.no_image { + println!("The following apps/services were compiled:"); + for path in services_path { + println!("{}", path); + } + } else if self.target.is_none() { // hosted mode doesn't specify a cross-compilation target! // throw a warning if prebuilts are specified for hosted mode for item in [&self.services[..], &self.apps[..]].concat() { match item { diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 6dc34e398..8acfea17e 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -363,6 +363,10 @@ fn main() -> Result<(), Box> { .add_services(&user_pkgs.into_iter().map(String::from).collect()) .add_feature("avalanchetest"); } + Some("compile-apps") => { + builder.target_precursor_no_image(PRECURSOR_SOC_VERSION) + .add_services(&gfx_base_pkgs.into_iter().map(String::from).collect()); + } // ------ Cramium hardware image configs ------ Some("cramium-fpga") | Some("cramium-soc") => { @@ -504,6 +508,7 @@ Other commands: generate-locales (re)generate the locales include for the language selected in locales/src/locale.rs wycheproof-import generate binary test vectors for engine-25519 from whycheproof-import/x25519.json install-toolkit installs Xous toolkit with no prompt, useful in CI. Specify `--force` to remove existing toolchains + compile-apps Just compiles the apps specified in [cratespecs], for example in order to use app server Note: By default, the `ticktimer` will get rebuilt every time. You can skip this by appending `--no-timestamp` to the command. "