Merge pull request #516 from viswajith-g/process-info

Author: lschuermann

examples/tutorials/dynamic-apps-and-policies/app_loader/Makefile

@@ -18,7 +18,7 @@ ELF2TAB_ARGS += --ecdsa-nist-p256-private ../keys/ec-secp256r1-tutorial-key.priv
 
 # List of apps to generate embed rules for:
 APPS_TO_EMBED := \
-	# ../../../blink \
+	# $(TOCK_USERLAND_BASE_DIR)/examples/blink \
 
 BINARY_COUNT = $(words $(APPS_TO_EMBED))
 AUTOGEN_HEADER = loadable_binaries.h

examples/tutorials/dynamic-apps-and-policies/app_loader/main.c

@@ -244,28 +244,28 @@ int main(void) {
   }
 
   // set up the setup done callback
-  int err1 = libtock_app_loader_set_setup_upcall(app_setup_done_callback, NULL);
+  int err1 = libtock_app_loader_subscribe_setup(app_setup_done_callback, NULL);
   if (err1 != 0) {
     printf("[Error] Failed to set setup done callback: %d\n", err1);
     return err1;
   }
 
   // set up the write done callback
-  int err2 = libtock_app_loader_set_write_upcall(app_write_done_callback, NULL);
+  int err2 = libtock_app_loader_subscribe_write(app_write_done_callback, NULL);
   if (err2 != 0) {
     printf("[Error] Failed to set flash write done callback: %d\n", err2);
     return err2;
   }
 
   // set up the finalize done callback
-  int err3 = libtock_app_loader_set_finalize_upcall(app_finalize_done_callback, NULL);
+  int err3 = libtock_app_loader_subscribe_finalize(app_finalize_done_callback, NULL);
   if (err3 != 0) {
     printf("[Error] Failed to set finalize done callback: %d\n", err3);
     return err3;
   }
 
   // set up the load done callback
-  int err4 = libtock_app_loader_set_load_upcall(app_load_done_callback, NULL);
+  int err4 = libtock_app_loader_subscribe_load(app_load_done_callback, NULL);
   if (err4 != 0) {
     printf("[Error] Failed to set load done callback: %d\n", err4);
     return err4;

libtock/kernel/app_loader.c

@@ -5,44 +5,44 @@
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_set_setup_upcall(subscribe_upcall cb, void* userdata) {
-  return libtock_app_loader_setup_subscribe(cb, userdata);
+returncode_t libtock_app_loader_subscribe_setup(subscribe_upcall cb, void* userdata) {
+  return libtock_app_loader_set_setup_upcall(cb, userdata);
 }
 
 /*
  * Function to setup the callback from capsule.
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_set_write_upcall(subscribe_upcall cb, void* userdata) {
-  return libtock_app_loader_write_subscribe(cb, userdata);
+returncode_t libtock_app_loader_subscribe_write(subscribe_upcall cb, void* userdata) {
+  return libtock_app_loader_set_write_upcall(cb, userdata);
 }
 
 /*
  * Function to setup the callback from capsule.
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_set_finalize_upcall(subscribe_upcall cb, void* userdata) {
-  return libtock_app_loader_finalize_subscribe(cb, userdata);
+returncode_t libtock_app_loader_subscribe_finalize(subscribe_upcall cb, void* userdata) {
+  return libtock_app_loader_set_finalize_upcall(cb, userdata);
 }
 
 /*
  * Function to setup the callback from capsule.
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_set_load_upcall(subscribe_upcall cb, void* userdata) {
-  return libtock_app_loader_load_subscribe(cb, userdata);
+returncode_t libtock_app_loader_subscribe_load(subscribe_upcall cb, void* userdata) {
+  return libtock_app_loader_set_load_upcall(cb, userdata);
 }
 
 /*
  * Function to setup the callback from capsule.
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_set_abort_upcall(subscribe_upcall cb, void* userdata) {
-  return libtock_app_loader_abort_subscribe(cb, userdata);
+returncode_t libtock_app_loader_subscribe_abort(subscribe_upcall cb, void* userdata) {
+  return libtock_app_loader_set_abort_upcall(cb, userdata);
 }
 
 /*

libtock/kernel/app_loader.h

@@ -17,35 +17,35 @@ extern "C"
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_set_setup_upcall(subscribe_upcall cb, void* userdata);
+returncode_t libtock_app_loader_subscribe_setup(subscribe_upcall cb, void* userdata);
 
 /*
  * Function to setup the callback from capsule.
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_set_write_upcall(subscribe_upcall cb, void* userdata);
+returncode_t libtock_app_loader_subscribe_write(subscribe_upcall cb, void* userdata);
 
 /*
  * Function to setup the callback from capsule.
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_set_finalize_upcall(subscribe_upcall cb, void* userdata);
+returncode_t libtock_app_loader_subscribe_finalize(subscribe_upcall cb, void* userdata);
 
 /*
  * Function to setup the callback from capsule.
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_set_load_upcall(subscribe_upcall cb, void* userdata);
+returncode_t libtock_app_loader_subscribe_load(subscribe_upcall cb, void* userdata);
 
 /*
  * Function to setup the callback from capsule.
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_set_abort_upcall(subscribe_upcall cb, void* userdata);
+returncode_t libtock_app_loader_subscribe_abort(subscribe_upcall cb, void* userdata);
 
 /*
  * Command to request the kernel to set up for a new app.

libtock/kernel/syscalls/app_loader_syscalls.c

@@ -4,27 +4,27 @@ bool libtock_app_loader_exists(void) {
   return driver_exists(DRIVER_NUM_APP_LOADER);
 }
 
-returncode_t libtock_app_loader_setup_subscribe(subscribe_upcall cb, void* userdata) {
+returncode_t libtock_app_loader_set_setup_upcall(subscribe_upcall cb, void* userdata) {
   subscribe_return_t sval = subscribe(DRIVER_NUM_APP_LOADER, 0, cb, userdata);
   return tock_subscribe_return_to_returncode(sval);
 }
 
-returncode_t libtock_app_loader_write_subscribe(subscribe_upcall cb, void* userdata) {
+returncode_t libtock_app_loader_set_write_upcall(subscribe_upcall cb, void* userdata) {
   subscribe_return_t sval = subscribe(DRIVER_NUM_APP_LOADER, 1, cb, userdata);
   return tock_subscribe_return_to_returncode(sval);
 }
 
-returncode_t libtock_app_loader_finalize_subscribe(subscribe_upcall cb, void* userdata) {
+returncode_t libtock_app_loader_set_finalize_upcall(subscribe_upcall cb, void* userdata) {
   subscribe_return_t sval = subscribe(DRIVER_NUM_APP_LOADER, 2, cb, userdata);
   return tock_subscribe_return_to_returncode(sval);
 }
 
-returncode_t libtock_app_loader_load_subscribe(subscribe_upcall cb, void* userdata) {
+returncode_t libtock_app_loader_set_load_upcall(subscribe_upcall cb, void* userdata) {
   subscribe_return_t sval = subscribe(DRIVER_NUM_APP_LOADER, 3, cb, userdata);
   return tock_subscribe_return_to_returncode(sval);
 }
 
-returncode_t libtock_app_loader_abort_subscribe(subscribe_upcall cb, void* userdata) {
+returncode_t libtock_app_loader_set_abort_upcall(subscribe_upcall cb, void* userdata) {
   subscribe_return_t sval = subscribe(DRIVER_NUM_APP_LOADER, 4, cb, userdata);
   return tock_subscribe_return_to_returncode(sval);
 }

libtock/kernel/syscalls/app_loader_syscalls.h

@@ -20,7 +20,7 @@ bool libtock_app_loader_exists(void);
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_setup_subscribe(subscribe_upcall cb, void* userdata);
+returncode_t libtock_app_loader_set_setup_upcall(subscribe_upcall cb, void* userdata);
 
 /*
  * Command to request the kernel to set up for a new app.
@@ -33,7 +33,7 @@ returncode_t libtock_app_loader_command_setup(uint32_t app_length);
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_write_subscribe(subscribe_upcall cb, void* userdata);
+returncode_t libtock_app_loader_set_write_upcall(subscribe_upcall cb, void* userdata);
 
 /*
  * Function to set up a shared buffer with the capsule.
@@ -56,7 +56,7 @@ returncode_t libtock_app_loader_command_write(uint32_t flash_offset, uint32_t wr
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_finalize_subscribe(subscribe_upcall cb, void* userdata);
+returncode_t libtock_app_loader_set_finalize_upcall(subscribe_upcall cb, void* userdata);
 
 /*
  * Signal to kernel we are done writing a new process binary.
@@ -73,7 +73,7 @@ returncode_t libtock_app_loader_command_load(void);
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_load_subscribe(subscribe_upcall cb, void* userdata);
+returncode_t libtock_app_loader_set_load_upcall(subscribe_upcall cb, void* userdata);
 
 /*
  * Command to request the kernel to abort setup/writing process.
@@ -85,7 +85,7 @@ returncode_t libtock_app_loader_command_abort(void);
  * This function takes in the function that will be executed
  * when the callback is triggered.
  */
-returncode_t libtock_app_loader_abort_subscribe(subscribe_upcall cb, void* userdata);
+returncode_t libtock_app_loader_set_abort_upcall(subscribe_upcall cb, void* userdata);