# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1679089424 -3600
# Node ID b00b58b24096a99f9c0e71e06f214879ca3632ec
# Parent  8be995c642471f7b5de2ee82c60b239c56356768
Added debugging support to show a name for each server in jdb.

diff -r 8be995c64247 -r b00b58b24096 conf/dstest_block_client.cfg
--- a/conf/dstest_block_client.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_block_client.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "server", "r" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_block_client_simple.cfg
--- a/conf/dstest_block_client_simple.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_block_client_simple.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "server", "r" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_exec.cfg
--- a/conf/dstest_exec.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_exec.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       pipeserver = pipe_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "pipes", "r" },
   },
@@ -19,6 +20,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "blocks", "r" },
   },
@@ -31,6 +33,7 @@
       blockserver = block_server,
       pipeserver = pipe_server,
       fsserver = ext2server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "ext2", "y" },
   },
@@ -47,6 +50,7 @@
     caps = {
       fsserver = ext2server_paulb,
       prserver = process_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "process", "y" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_ext2.cfg
--- a/conf/dstest_ext2.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_ext2.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "blocksvr", "r" },
   },
@@ -20,6 +21,7 @@
     caps = {
       blockserver = block_server,
       fsserver = ext2server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "ext2svr", "y" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_ext2fs_client.cfg
--- a/conf/dstest_ext2fs_client.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_ext2fs_client.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "blocksvr", "r" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_file_access.cfg
--- a/conf/dstest_file_access.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_file_access.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       pipeserver = pipe_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "pipes", "r" },
   },
@@ -19,6 +20,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "blocksvr", "r" },
   },
@@ -31,6 +33,7 @@
       blockserver = block_server,
       pipeserver = pipe_server,
       fsserver = ext2server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "ext2svr", "y" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_file_client.cfg
--- a/conf/dstest_file_client.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_file_client.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "blocksvr", "r" },
   },
@@ -20,6 +21,7 @@
     caps = {
       blockserver = block_server,
       fsserver = ext2server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "ext2svr", "y" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_file_mapping.cfg
--- a/conf/dstest_file_mapping.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_file_mapping.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       fsserver = host_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "server", "r" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_file_monitor.cfg
--- a/conf/dstest_file_monitor.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_file_monitor.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "blocksvr", "r" },
   },
@@ -20,6 +21,7 @@
     caps = {
       blockserver = block_server,
       fsserver = ext2server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "ext2svr", "y" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_file_readdir.cfg
--- a/conf/dstest_file_readdir.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_file_readdir.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       pipeserver = pipe_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "pipes", "r" },
   },
@@ -19,6 +20,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "blocksvr", "r" },
   },
@@ -31,6 +33,7 @@
       blockserver = block_server,
       pipeserver = pipe_server,
       fsserver = ext2server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "ext2svr", "y" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_file_readdir_concurrent.cfg
--- a/conf/dstest_file_readdir_concurrent.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_file_readdir_concurrent.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       pipeserver = pipe_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "pipes", "r" },
   },
@@ -19,6 +20,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "blocksvr", "r" },
   },
@@ -31,6 +33,7 @@
       blockserver = block_server,
       pipeserver = pipe_server,
       fsserver = ext2server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "ext2svr", "y" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_file_remove.cfg
--- a/conf/dstest_file_remove.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_file_remove.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       pipeserver = pipe_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "pipes", "r" },
   },
@@ -19,6 +20,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "blocksvr", "r" },
   },
@@ -31,6 +33,7 @@
       blockserver = block_server,
       pipeserver = pipe_server,
       fsserver = ext2server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "ext2svr", "y" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_file_rename.cfg
--- a/conf/dstest_file_rename.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_file_rename.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       pipeserver = pipe_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "pipes", "r" },
   },
@@ -19,6 +20,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "blocksvr", "r" },
   },
@@ -31,6 +33,7 @@
       blockserver = block_server,
       pipeserver = pipe_server,
       fsserver = ext2server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "ext2svr", "y" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_fsaccess.cfg
--- a/conf/dstest_fsaccess.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_fsaccess.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       pipeserver = pipe_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "pipes", "r" },
   },
@@ -19,6 +20,7 @@
 l:startv({
     caps = {
       fsserver = block_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "blocksvr", "r" },
   },
@@ -31,6 +33,7 @@
       blockserver = block_server,
       pipeserver = pipe_server,
       fsserver = ext2server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "ext2svr", "y" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_host_client.cfg
--- a/conf/dstest_host_client.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_host_client.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       fsserver = host_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "server", "r" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_host_readdir.cfg
--- a/conf/dstest_host_readdir.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_host_readdir.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       pipeserver = pipe_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "pipes", "r" },
   },
@@ -20,6 +21,7 @@
     caps = {
       pipeserver = pipe_server,
       fsserver = host_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "server", "r" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_pipe_client.cfg
--- a/conf/dstest_pipe_client.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_pipe_client.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       pipeserver = pipe_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "server", "r" },
   },
diff -r 8be995c64247 -r b00b58b24096 conf/dstest_test_client.cfg
--- a/conf/dstest_test_client.cfg	Fri Mar 17 18:34:18 2023 +0100
+++ b/conf/dstest_test_client.cfg	Fri Mar 17 22:43:44 2023 +0100
@@ -9,6 +9,7 @@
 l:startv({
     caps = {
       fsserver = test_server:svr(),
+      jdb = L4.Env.jdb, -- to set the server name
     },
     log = { "server", "r" },
   },
diff -r 8be995c64247 -r b00b58b24096 servers/block_file_server.cc
--- a/servers/block_file_server.cc	Fri Mar 17 18:34:18 2023 +0100
+++ b/servers/block_file_server.cc	Fri Mar 17 22:43:44 2023 +0100
@@ -19,6 +19,7 @@
  * Boston, MA  02110-1301, USA
  */
 
+#include <l4/sys/debugger.h>
 #include <l4/sys/err.h>
 
 #include <ipc/thread.h>
@@ -45,6 +46,7 @@
 
 int main(int argc, char *argv[])
 {
+  l4_debugger_set_object_name(l4re_env()->main_thread, "block_server");
   long err;
 
   /* Introduce concurrency control. */
diff -r 8be995c64247 -r b00b58b24096 servers/client_file_server.cc
--- a/servers/client_file_server.cc	Fri Mar 17 18:34:18 2023 +0100
+++ b/servers/client_file_server.cc	Fri Mar 17 22:43:44 2023 +0100
@@ -20,6 +20,7 @@
  * Boston, MA  02110-1301, USA
  */
 
+#include <l4/sys/debugger.h>
 #include <l4/sys/err.h>
 
 #include <ipc/thread.h>
@@ -46,6 +47,7 @@
 
 int main(int argc, char *argv[])
 {
+  l4_debugger_set_object_name(l4re_env()->main_thread, "client_server");
   long err;
 
   /* Introduce concurrency control. */
diff -r 8be995c64247 -r b00b58b24096 servers/ext2_file_server.cc
--- a/servers/ext2_file_server.cc	Fri Mar 17 18:34:18 2023 +0100
+++ b/servers/ext2_file_server.cc	Fri Mar 17 22:43:44 2023 +0100
@@ -19,6 +19,7 @@
  * Boston, MA  02110-1301, USA
  */
 
+#include <l4/sys/debugger.h>
 #include <l4/sys/err.h>
 
 #include <ipc/thread.h>
@@ -46,6 +47,8 @@
 
 int main(int argc, char *argv[])
 {
+  l4_debugger_set_object_name(l4re_env()->main_thread, "ext2_server");
+
   /* Require filesystem object details. */
 
   if (argc < 3)
diff -r 8be995c64247 -r b00b58b24096 servers/host_file_server.cc
--- a/servers/host_file_server.cc	Fri Mar 17 18:34:18 2023 +0100
+++ b/servers/host_file_server.cc	Fri Mar 17 22:43:44 2023 +0100
@@ -19,6 +19,7 @@
  * Boston, MA  02110-1301, USA
  */
 
+#include <l4/sys/debugger.h>
 #include <l4/sys/err.h>
 
 #include <ipc/thread.h>
@@ -45,6 +46,7 @@
 
 int main(int argc, char *argv[])
 {
+  l4_debugger_set_object_name(l4re_env()->main_thread, "host_server");
   long err;
 
   /* Introduce concurrency control. */
diff -r 8be995c64247 -r b00b58b24096 servers/pipe_server.cc
--- a/servers/pipe_server.cc	Fri Mar 17 18:34:18 2023 +0100
+++ b/servers/pipe_server.cc	Fri Mar 17 22:43:44 2023 +0100
@@ -19,6 +19,8 @@
  * Boston, MA  02110-1301, USA
  */
 
+#include <l4/re/env.h>
+#include <l4/sys/debugger.h>
 #include <l4/sys/err.h>
 
 #include <ipc/thread.h>
@@ -37,6 +39,7 @@
 
 int main(int argc, char *argv[])
 {
+  l4_debugger_set_object_name(l4re_env()->main_thread, "pipe_server");
   long err;
 
   /* Introduce concurrency control. */
diff -r 8be995c64247 -r b00b58b24096 servers/process_server.cc
--- a/servers/process_server.cc	Fri Mar 17 18:34:18 2023 +0100
+++ b/servers/process_server.cc	Fri Mar 17 22:43:44 2023 +0100
@@ -19,6 +19,7 @@
  * Boston, MA  02110-1301, USA
  */
 
+#include <l4/sys/debugger.h>
 #include <l4/sys/err.h>
 
 #include <ipc/thread.h>
@@ -36,6 +37,8 @@
 
 int main(int argc, char *argv[])
 {
+  l4_debugger_set_object_name(l4re_env()->main_thread, "process_server");
+
   if (argc < 2)
   {
     printf("Need a region mapper.\n");
diff -r 8be995c64247 -r b00b58b24096 servers/test_file_server.cc
--- a/servers/test_file_server.cc	Fri Mar 17 18:34:18 2023 +0100
+++ b/servers/test_file_server.cc	Fri Mar 17 22:43:44 2023 +0100
@@ -19,6 +19,7 @@
  * Boston, MA  02110-1301, USA
  */
 
+#include <l4/sys/debugger.h>
 #include <l4/sys/err.h>
 
 #include <ipc/thread.h>
@@ -42,6 +43,7 @@
 
 int main(int argc, char *argv[])
 {
+  l4_debugger_set_object_name(l4re_env()->main_thread, "test_server");
   long err;
 
   /* Introduce concurrency control. */