various improvements, cpu percentages, human readable file sizes in dir

Author: braindigitalis

include/basic/process.h

@@ -133,3 +133,5 @@ void eval_statement(struct basic_ctx* ctx);
 void goto_statement(struct basic_ctx* ctx);
 
 void yield_statement(struct basic_ctx* ctx);
+
+int64_t basic_getproccpu(struct basic_ctx* ctx);

include/taskswitch.h

@@ -53,23 +53,24 @@ typedef bool (*activity_callback_t)(struct process_t* proc, void* opaque);
  * in a global doubly-linked list for scheduling.
  */
 typedef struct process_t {
-	pid_t			pid;        /**< Unique process ID */
-	pid_t			ppid;       /**< Parent process ID */
-	process_state_t		state;      /**< Running state */
-	time_t			start_time; /**< Start time (UNIX epoch) */
-	pid_t			waitpid;    /**< PID being waited on */
-	cpu_id_t		cpu;        /**< Logical CPU this process is assigned to */
-	const char*		directory;  /**< Directory of program */
-	const char*		name;       /**< Filename of program */
-	size_t			size;       /**< Size of program in bytes */
-	const char*		csd;        /**< Current selected directory */
-	struct basic_ctx*	code;       /**< BASIC interpreter context */
-	struct process_t*	sched_next; /**< Next process in doubly linked list */
-	struct process_t*	sched_prev; /**< Previous process in doubly linked list */
-	struct process_t*	global_next; /**< Next process in doubly linked list */
-	struct process_t*	global_prev; /**< Previous process in doubly linked list */
-	activity_callback_t	check_idle; /**< If non-null, called to check if the process should remain idle */
-	void*			idle_context; /**< Opaque context passed to the check_idle callback */
+	pid_t			pid;		/**< Unique process ID */
+	pid_t			ppid;		/**< Parent process ID */
+	process_state_t		state;		/**< Running state */
+	time_t			start_time;	/**< Start time (UNIX epoch) */
+	pid_t			waitpid;	/**< PID being waited on */
+	cpu_id_t		cpu;		/**< Logical CPU this process is assigned to */
+	const char*		directory;	/**< Directory of program */
+	const char*		name;		/**< Filename of program */
+	size_t			size;		/**< Size of program in bytes */
+	const char*		csd;		/**< Current selected directory */
+	struct basic_ctx*	code;		/**< BASIC interpreter context */
+	struct process_t*	sched_next;	/**< Next process in doubly linked list */
+	struct process_t*	sched_prev;	/**< Previous process in doubly linked list */
+	struct process_t*	global_next;	/**< Next process in doubly linked list */
+	struct process_t*	global_prev;	/**< Previous process in doubly linked list */
+	activity_callback_t	check_idle;	/**< If non-null, called to check if the process should remain idle */
+	void*			idle_context;	/**< Opaque context passed to the check_idle callback */
+	uint32_t		cpu_percent;	/**< Rolling average CPU usage percentage */
 } process_t;
 
 /**
@@ -305,4 +306,31 @@ void proc_queue_dpc(dpc_t handler);
  */
 void run_idles(uint8_t cpu);
 
-process_t* proc_load_anonymous(const char* source, pid_t parent_pid, const char* csd);
+/**
+ * @brief Create and start an anonymous BASIC process from a source string
+ *
+ * This function creates a new process using the provided BASIC source code
+ * rather than loading it from the filesystem. The process is initialised
+ * and scheduled in the same way as one created via proc_load().
+ *
+ * @param source The BASIC program source code (must be valid and non-empty)
+ * @param parent_pid The PID of the parent process
+ * @param csd The current working directory to assign to the process
+ *
+ * @return Pointer to the newly created process on success, or NULL on failure
+ */
+process_t* proc_load_anonymous(const char* source, pid_t parent_pid, const char* csd);
+
+/**
+ * @brief Get the averaged CPU usage percentage for a process
+ *
+ * Returns the rolling average CPU usage for the specified process as an
+ * integer percentage in the range 0–100. A value of 0 indicates the process
+ * is idle or waiting, while higher values indicate a greater share of CPU
+ * time over the recent sampling window.
+ *
+ * @param pid The process ID to query
+ *
+ * @return CPU usage percentage for the process, or 0 if the PID is invalid
+ */
+uint32_t proc_cpu_percent(pid_t pid);

os/programs/charmap.rrbasic

@@ -1,9 +1,9 @@
 FOR C = &20 TO &7E
-	COLOR 8
+	COLOUR 8
 	PRINT ~C; ": "; 
-	COLOR 15
+	COLOUR 15
 	PRINT CHR$(C); " ";
 	IF C % 8 = 7 THEN PRINT ""
 NEXT
 PRINT ""
-COLOR 7
+COLOUR 7

os/programs/dir.rrbasic

@@ -9,26 +9,35 @@ IF DIR$ <> "" THEN PREPEND$ = DIR$ + "/"
 
 FOR X = N - 1 TO 0 STEP -1
 	FILE$ = GETNAME$(DIR$,X)
-	IF FILETYPE$(PREPEND$ + FILE$) = "directory" THEN COLOR 9
-	IF FILETYPE$(PREPEND$ + FILE$) = "file" THEN COLOR 15
+	FT$ = FILETYPE$(PREPEND$ + FILE$)
+	IF FT$ = "directory" THEN COLOUR 9
+	IF FT$ = "file" THEN COLOUR 15
 	PRINT FILE$;
 	COLOUR 8
 	REPEAT
 		PRINT " ";
 	UNTIL CURRENTX > 25
-	SIZE# = GETSIZE(DIR$,X)
-	PRINT SIZE#;
+	PRINT FNhumanSize$(GETSIZE(DIR$,X));
 	REPEAT
 		PRINT " ";
 	UNTIL CURRENTX > 35
-	COLOR 7
-	PRINT UPPER$(LEFT$(FILETYPE$(PREPEND$ + FILE$),1))
+	COLOUR 7
+	PRINT UPPER$(LEFT$(FT$,1))
 NEXT
 PROCreport
 END
 
 DEF PROCreport
 	IF DIR$ = "" THEN DIR$ = CSD$
-	COLOR 7
+	COLOUR 7
 	PRINT N; " items in " + DIR$
 ENDPROC
+
+DEF FNhumanSize$(size)
+    X$ = STR$(size)
+    IF (size > 1024 * 1024) THEN
+        X$ = STR$(size / 1024 / 1024) + "M"
+        size = 0
+    ENDIF
+    IF (size > 1024) THEN X$ = STR$(size / 1024) + "K"
+=X$

os/programs/init.rrbasic

@@ -27,9 +27,9 @@ UNTIL FALSE
 
 DEF PROCmessage(white$, yellow$)
 	PRINT white$; " ";
-	COLOR 14
+	COLOUR 14
 	PRINT yellow$;
-	COLOR 7
+	COLOUR 7
 	PRINT "..."
 ENDPROC
 

os/programs/irc.rrbasic

@@ -97,7 +97,7 @@ ENDPROC
 DEF PROCdisplayInput
 	PROChideCursor
 	CURSOR 2, TERMHEIGHT
-	COLOR 15
+	COLOUR 15
 	BACKGROUND 1
 	leftX = LEN(curChannel$) + 5
 	PRINT "["; curChannel$; "] ";

os/programs/proclist.rrbasic

@@ -1,20 +1,27 @@
 REM Process List
 REM ------------
 
-COLOR 15
-PRINT "PID", "PPID", "CPUID", "MEMORY", "STATE      ", "PROCESS NAME"
-COLOR 7
+COLOUR 15
+PRINT "PID", "PPID", "CPUID", "CPU%", "MEMORY", "STATE      ", "PROCESS NAME"
+COLOUR 7
 PROCline()
+IDLE = 100
 FOR Y = 0 TO GETPROCCOUNT - 1
-	PRINT GETPROCID(Y), GETPROCPARENT(Y); " ", GETPROCCPUID(Y), FNhumanSize$(GETPROCMEM(Y)), GETPROCSTATE$(Y); " ";
-	COLOR 15
+    PERC = GETPROCCPU(GETPROCID(Y))
+    IDLE = IDLE - PERC
+	PRINT GETPROCID(Y), GETPROCPARENT(Y); " ", GETPROCCPUID(Y), PERC; "%", FNhumanSize$(GETPROCMEM(Y)), GETPROCSTATE$(Y); " ";
+	COLOUR 15
 	PRINT "", LEFT$(GETPROCNAME$(Y), 60)
-	COLOR 7
+	COLOUR 7
 NEXT
+PRINT "-", "-"; " ", "-", MAX(IDLE, 0); "%", "0K", "idle     ";
+COLOUR 15
+PRINT "", "Idle"
+COLOUR 7
 PROCline()
-COLOR 15
+COLOUR 15
 PRINT GETPROCCOUNT; " Total Processes"
-COLOR 7
+COLOUR 7
 END
 
 DEF FNhumanSize$(size)

os/programs/rocketsh.rrbasic

@@ -14,9 +14,9 @@ VERSION$ = "3.1"
 REM Welcome message
 PRINT ""
 PRINT "Welcome to ";
-COLOR 14
+COLOUR 14
 PRINT "Retro Rocket ";
-COLOR 7
+COLOUR 7
 PRINT "BASIC shell."
 PRINT MEMFREE; " bytes free."
 PRINT ""
@@ -34,9 +34,9 @@ END
 
 REM Prompt display
 DEF PROCdisplayPrompt
-	COLOR 14
+	COLOUR 14
 	PRINT PROMPT$;
-	COLOR 7
+	COLOUR 7
 	PRINT "> ";
 ENDPROC
 
@@ -131,9 +131,9 @@ REM display version information
 DEF PROCversion
 	PRINT "┌─────────────────────────────────────────────────────┐"
 	PRINT "│ ";
-	COLOR 14
+	COLOUR 14
 	PRINT "rocketsh ";
-	COLOR 7
+	COLOUR 7
 	PRINT "Retro Rocket Shell version "; VERSION$; "             │"
 	PRINT "├─────────────────────────────────────────────────────┤"
 	PRINT "│ Licensed under the Apache 2.0 License.              │"
@@ -180,9 +180,9 @@ DEF PROCbuiltinHistory
 
 	entry = 1
 	FOR i = EDhistPtr - 1 TO 1 STEP -1
-		COLOR 14
+		COLOUR 14
 		PRINT entry;
-		COLOR 7
+		COLOUR 7
 		PRINT "> ";
 		PRINT EDhist$(i)
 		entry = entry + 1
@@ -308,9 +308,9 @@ DEF PROCbuiltinMultiLineRepl
     MULTI$ = ""
     multiLine = 1
     REPEAT
-        COLOR 14
+        COLOUR 14
         PRINT multiLine;
-        COLOR 7
+        COLOUR 7
         PRINT "> ";
         PROCEdLine
         PRINT ""

src/basic/function.c

@@ -179,6 +179,7 @@ struct basic_int_fn builtin_int[] =
 	{ basic_tell,                "TELL"              },
 	{ basic_memrealloc,          "MEMREALLOC"        },
 	{ basic_string_to_buffer,    "STRINGTOBUFFER"    },
+	{ basic_getproccpu,          "GETPROCCPU"        },
 	{ NULL,                      NULL                },
 };
 

src/basic/process.c

@@ -42,6 +42,14 @@ int64_t basic_getprocid(struct basic_ctx* ctx)
 	return proc_id(intval);
 }
 
+int64_t basic_getproccpu(struct basic_ctx* ctx)
+{
+	PARAMS_START;
+	PARAMS_GET_ITEM(BIP_INT);
+	PARAMS_END("GETPROCCPU", 0);
+	return proc_cpu_percent(intval);
+}
+
 char* basic_getprocname(struct basic_ctx* ctx)
 {
 	PARAMS_START;