L4Re/departure

Changeset

519:b00b58b24096
2023-03-17 Paul Boddie raw files shortlog changelog graph Added debugging support to show a name for each server in jdb.
conf/dstest_block_client.cfg (file) conf/dstest_block_client_simple.cfg (file) conf/dstest_exec.cfg (file) conf/dstest_ext2.cfg (file) conf/dstest_ext2fs_client.cfg (file) conf/dstest_file_access.cfg (file) conf/dstest_file_client.cfg (file) conf/dstest_file_mapping.cfg (file) conf/dstest_file_monitor.cfg (file) conf/dstest_file_readdir.cfg (file) conf/dstest_file_readdir_concurrent.cfg (file) conf/dstest_file_remove.cfg (file) conf/dstest_file_rename.cfg (file) conf/dstest_fsaccess.cfg (file) conf/dstest_host_client.cfg (file) conf/dstest_host_readdir.cfg (file) conf/dstest_pipe_client.cfg (file) conf/dstest_test_client.cfg (file) servers/block_file_server.cc (file) servers/client_file_server.cc (file) servers/ext2_file_server.cc (file) servers/host_file_server.cc (file) servers/pipe_server.cc (file) servers/process_server.cc (file) servers/test_file_server.cc (file)
     1.1 --- a/conf/dstest_block_client.cfg	Fri Mar 17 18:34:18 2023 +0100
     1.2 +++ b/conf/dstest_block_client.cfg	Fri Mar 17 22:43:44 2023 +0100
     1.3 @@ -9,6 +9,7 @@
     1.4  l:startv({
     1.5      caps = {
     1.6        fsserver = block_server:svr(),
     1.7 +      jdb = L4.Env.jdb, -- to set the server name
     1.8      },
     1.9      log = { "server", "r" },
    1.10    },
     2.1 --- a/conf/dstest_block_client_simple.cfg	Fri Mar 17 18:34:18 2023 +0100
     2.2 +++ b/conf/dstest_block_client_simple.cfg	Fri Mar 17 22:43:44 2023 +0100
     2.3 @@ -9,6 +9,7 @@
     2.4  l:startv({
     2.5      caps = {
     2.6        fsserver = block_server:svr(),
     2.7 +      jdb = L4.Env.jdb, -- to set the server name
     2.8      },
     2.9      log = { "server", "r" },
    2.10    },
     3.1 --- a/conf/dstest_exec.cfg	Fri Mar 17 18:34:18 2023 +0100
     3.2 +++ b/conf/dstest_exec.cfg	Fri Mar 17 22:43:44 2023 +0100
     3.3 @@ -9,6 +9,7 @@
     3.4  l:startv({
     3.5      caps = {
     3.6        pipeserver = pipe_server:svr(),
     3.7 +      jdb = L4.Env.jdb, -- to set the server name
     3.8      },
     3.9      log = { "pipes", "r" },
    3.10    },
    3.11 @@ -19,6 +20,7 @@
    3.12  l:startv({
    3.13      caps = {
    3.14        fsserver = block_server:svr(),
    3.15 +      jdb = L4.Env.jdb, -- to set the server name
    3.16      },
    3.17      log = { "blocks", "r" },
    3.18    },
    3.19 @@ -31,6 +33,7 @@
    3.20        blockserver = block_server,
    3.21        pipeserver = pipe_server,
    3.22        fsserver = ext2server:svr(),
    3.23 +      jdb = L4.Env.jdb, -- to set the server name
    3.24      },
    3.25      log = { "ext2", "y" },
    3.26    },
    3.27 @@ -47,6 +50,7 @@
    3.28      caps = {
    3.29        fsserver = ext2server_paulb,
    3.30        prserver = process_server:svr(),
    3.31 +      jdb = L4.Env.jdb, -- to set the server name
    3.32      },
    3.33      log = { "process", "y" },
    3.34    },
     4.1 --- a/conf/dstest_ext2.cfg	Fri Mar 17 18:34:18 2023 +0100
     4.2 +++ b/conf/dstest_ext2.cfg	Fri Mar 17 22:43:44 2023 +0100
     4.3 @@ -9,6 +9,7 @@
     4.4  l:startv({
     4.5      caps = {
     4.6        fsserver = block_server:svr(),
     4.7 +      jdb = L4.Env.jdb, -- to set the server name
     4.8      },
     4.9      log = { "blocksvr", "r" },
    4.10    },
    4.11 @@ -20,6 +21,7 @@
    4.12      caps = {
    4.13        blockserver = block_server,
    4.14        fsserver = ext2server:svr(),
    4.15 +      jdb = L4.Env.jdb, -- to set the server name
    4.16      },
    4.17      log = { "ext2svr", "y" },
    4.18    },
     5.1 --- a/conf/dstest_ext2fs_client.cfg	Fri Mar 17 18:34:18 2023 +0100
     5.2 +++ b/conf/dstest_ext2fs_client.cfg	Fri Mar 17 22:43:44 2023 +0100
     5.3 @@ -9,6 +9,7 @@
     5.4  l:startv({
     5.5      caps = {
     5.6        fsserver = block_server:svr(),
     5.7 +      jdb = L4.Env.jdb, -- to set the server name
     5.8      },
     5.9      log = { "blocksvr", "r" },
    5.10    },
     6.1 --- a/conf/dstest_file_access.cfg	Fri Mar 17 18:34:18 2023 +0100
     6.2 +++ b/conf/dstest_file_access.cfg	Fri Mar 17 22:43:44 2023 +0100
     6.3 @@ -9,6 +9,7 @@
     6.4  l:startv({
     6.5      caps = {
     6.6        pipeserver = pipe_server:svr(),
     6.7 +      jdb = L4.Env.jdb, -- to set the server name
     6.8      },
     6.9      log = { "pipes", "r" },
    6.10    },
    6.11 @@ -19,6 +20,7 @@
    6.12  l:startv({
    6.13      caps = {
    6.14        fsserver = block_server:svr(),
    6.15 +      jdb = L4.Env.jdb, -- to set the server name
    6.16      },
    6.17      log = { "blocksvr", "r" },
    6.18    },
    6.19 @@ -31,6 +33,7 @@
    6.20        blockserver = block_server,
    6.21        pipeserver = pipe_server,
    6.22        fsserver = ext2server:svr(),
    6.23 +      jdb = L4.Env.jdb, -- to set the server name
    6.24      },
    6.25      log = { "ext2svr", "y" },
    6.26    },
     7.1 --- a/conf/dstest_file_client.cfg	Fri Mar 17 18:34:18 2023 +0100
     7.2 +++ b/conf/dstest_file_client.cfg	Fri Mar 17 22:43:44 2023 +0100
     7.3 @@ -9,6 +9,7 @@
     7.4  l:startv({
     7.5      caps = {
     7.6        fsserver = block_server:svr(),
     7.7 +      jdb = L4.Env.jdb, -- to set the server name
     7.8      },
     7.9      log = { "blocksvr", "r" },
    7.10    },
    7.11 @@ -20,6 +21,7 @@
    7.12      caps = {
    7.13        blockserver = block_server,
    7.14        fsserver = ext2server:svr(),
    7.15 +      jdb = L4.Env.jdb, -- to set the server name
    7.16      },
    7.17      log = { "ext2svr", "y" },
    7.18    },
     8.1 --- a/conf/dstest_file_mapping.cfg	Fri Mar 17 18:34:18 2023 +0100
     8.2 +++ b/conf/dstest_file_mapping.cfg	Fri Mar 17 22:43:44 2023 +0100
     8.3 @@ -9,6 +9,7 @@
     8.4  l:startv({
     8.5      caps = {
     8.6        fsserver = host_server:svr(),
     8.7 +      jdb = L4.Env.jdb, -- to set the server name
     8.8      },
     8.9      log = { "server", "r" },
    8.10    },
     9.1 --- a/conf/dstest_file_monitor.cfg	Fri Mar 17 18:34:18 2023 +0100
     9.2 +++ b/conf/dstest_file_monitor.cfg	Fri Mar 17 22:43:44 2023 +0100
     9.3 @@ -9,6 +9,7 @@
     9.4  l:startv({
     9.5      caps = {
     9.6        fsserver = block_server:svr(),
     9.7 +      jdb = L4.Env.jdb, -- to set the server name
     9.8      },
     9.9      log = { "blocksvr", "r" },
    9.10    },
    9.11 @@ -20,6 +21,7 @@
    9.12      caps = {
    9.13        blockserver = block_server,
    9.14        fsserver = ext2server:svr(),
    9.15 +      jdb = L4.Env.jdb, -- to set the server name
    9.16      },
    9.17      log = { "ext2svr", "y" },
    9.18    },
    10.1 --- a/conf/dstest_file_readdir.cfg	Fri Mar 17 18:34:18 2023 +0100
    10.2 +++ b/conf/dstest_file_readdir.cfg	Fri Mar 17 22:43:44 2023 +0100
    10.3 @@ -9,6 +9,7 @@
    10.4  l:startv({
    10.5      caps = {
    10.6        pipeserver = pipe_server:svr(),
    10.7 +      jdb = L4.Env.jdb, -- to set the server name
    10.8      },
    10.9      log = { "pipes", "r" },
   10.10    },
   10.11 @@ -19,6 +20,7 @@
   10.12  l:startv({
   10.13      caps = {
   10.14        fsserver = block_server:svr(),
   10.15 +      jdb = L4.Env.jdb, -- to set the server name
   10.16      },
   10.17      log = { "blocksvr", "r" },
   10.18    },
   10.19 @@ -31,6 +33,7 @@
   10.20        blockserver = block_server,
   10.21        pipeserver = pipe_server,
   10.22        fsserver = ext2server:svr(),
   10.23 +      jdb = L4.Env.jdb, -- to set the server name
   10.24      },
   10.25      log = { "ext2svr", "y" },
   10.26    },
    11.1 --- a/conf/dstest_file_readdir_concurrent.cfg	Fri Mar 17 18:34:18 2023 +0100
    11.2 +++ b/conf/dstest_file_readdir_concurrent.cfg	Fri Mar 17 22:43:44 2023 +0100
    11.3 @@ -9,6 +9,7 @@
    11.4  l:startv({
    11.5      caps = {
    11.6        pipeserver = pipe_server:svr(),
    11.7 +      jdb = L4.Env.jdb, -- to set the server name
    11.8      },
    11.9      log = { "pipes", "r" },
   11.10    },
   11.11 @@ -19,6 +20,7 @@
   11.12  l:startv({
   11.13      caps = {
   11.14        fsserver = block_server:svr(),
   11.15 +      jdb = L4.Env.jdb, -- to set the server name
   11.16      },
   11.17      log = { "blocksvr", "r" },
   11.18    },
   11.19 @@ -31,6 +33,7 @@
   11.20        blockserver = block_server,
   11.21        pipeserver = pipe_server,
   11.22        fsserver = ext2server:svr(),
   11.23 +      jdb = L4.Env.jdb, -- to set the server name
   11.24      },
   11.25      log = { "ext2svr", "y" },
   11.26    },
    12.1 --- a/conf/dstest_file_remove.cfg	Fri Mar 17 18:34:18 2023 +0100
    12.2 +++ b/conf/dstest_file_remove.cfg	Fri Mar 17 22:43:44 2023 +0100
    12.3 @@ -9,6 +9,7 @@
    12.4  l:startv({
    12.5      caps = {
    12.6        pipeserver = pipe_server:svr(),
    12.7 +      jdb = L4.Env.jdb, -- to set the server name
    12.8      },
    12.9      log = { "pipes", "r" },
   12.10    },
   12.11 @@ -19,6 +20,7 @@
   12.12  l:startv({
   12.13      caps = {
   12.14        fsserver = block_server:svr(),
   12.15 +      jdb = L4.Env.jdb, -- to set the server name
   12.16      },
   12.17      log = { "blocksvr", "r" },
   12.18    },
   12.19 @@ -31,6 +33,7 @@
   12.20        blockserver = block_server,
   12.21        pipeserver = pipe_server,
   12.22        fsserver = ext2server:svr(),
   12.23 +      jdb = L4.Env.jdb, -- to set the server name
   12.24      },
   12.25      log = { "ext2svr", "y" },
   12.26    },
    13.1 --- a/conf/dstest_file_rename.cfg	Fri Mar 17 18:34:18 2023 +0100
    13.2 +++ b/conf/dstest_file_rename.cfg	Fri Mar 17 22:43:44 2023 +0100
    13.3 @@ -9,6 +9,7 @@
    13.4  l:startv({
    13.5      caps = {
    13.6        pipeserver = pipe_server:svr(),
    13.7 +      jdb = L4.Env.jdb, -- to set the server name
    13.8      },
    13.9      log = { "pipes", "r" },
   13.10    },
   13.11 @@ -19,6 +20,7 @@
   13.12  l:startv({
   13.13      caps = {
   13.14        fsserver = block_server:svr(),
   13.15 +      jdb = L4.Env.jdb, -- to set the server name
   13.16      },
   13.17      log = { "blocksvr", "r" },
   13.18    },
   13.19 @@ -31,6 +33,7 @@
   13.20        blockserver = block_server,
   13.21        pipeserver = pipe_server,
   13.22        fsserver = ext2server:svr(),
   13.23 +      jdb = L4.Env.jdb, -- to set the server name
   13.24      },
   13.25      log = { "ext2svr", "y" },
   13.26    },
    14.1 --- a/conf/dstest_fsaccess.cfg	Fri Mar 17 18:34:18 2023 +0100
    14.2 +++ b/conf/dstest_fsaccess.cfg	Fri Mar 17 22:43:44 2023 +0100
    14.3 @@ -9,6 +9,7 @@
    14.4  l:startv({
    14.5      caps = {
    14.6        pipeserver = pipe_server:svr(),
    14.7 +      jdb = L4.Env.jdb, -- to set the server name
    14.8      },
    14.9      log = { "pipes", "r" },
   14.10    },
   14.11 @@ -19,6 +20,7 @@
   14.12  l:startv({
   14.13      caps = {
   14.14        fsserver = block_server:svr(),
   14.15 +      jdb = L4.Env.jdb, -- to set the server name
   14.16      },
   14.17      log = { "blocksvr", "r" },
   14.18    },
   14.19 @@ -31,6 +33,7 @@
   14.20        blockserver = block_server,
   14.21        pipeserver = pipe_server,
   14.22        fsserver = ext2server:svr(),
   14.23 +      jdb = L4.Env.jdb, -- to set the server name
   14.24      },
   14.25      log = { "ext2svr", "y" },
   14.26    },
    15.1 --- a/conf/dstest_host_client.cfg	Fri Mar 17 18:34:18 2023 +0100
    15.2 +++ b/conf/dstest_host_client.cfg	Fri Mar 17 22:43:44 2023 +0100
    15.3 @@ -9,6 +9,7 @@
    15.4  l:startv({
    15.5      caps = {
    15.6        fsserver = host_server:svr(),
    15.7 +      jdb = L4.Env.jdb, -- to set the server name
    15.8      },
    15.9      log = { "server", "r" },
   15.10    },
    16.1 --- a/conf/dstest_host_readdir.cfg	Fri Mar 17 18:34:18 2023 +0100
    16.2 +++ b/conf/dstest_host_readdir.cfg	Fri Mar 17 22:43:44 2023 +0100
    16.3 @@ -9,6 +9,7 @@
    16.4  l:startv({
    16.5      caps = {
    16.6        pipeserver = pipe_server:svr(),
    16.7 +      jdb = L4.Env.jdb, -- to set the server name
    16.8      },
    16.9      log = { "pipes", "r" },
   16.10    },
   16.11 @@ -20,6 +21,7 @@
   16.12      caps = {
   16.13        pipeserver = pipe_server,
   16.14        fsserver = host_server:svr(),
   16.15 +      jdb = L4.Env.jdb, -- to set the server name
   16.16      },
   16.17      log = { "server", "r" },
   16.18    },
    17.1 --- a/conf/dstest_pipe_client.cfg	Fri Mar 17 18:34:18 2023 +0100
    17.2 +++ b/conf/dstest_pipe_client.cfg	Fri Mar 17 22:43:44 2023 +0100
    17.3 @@ -9,6 +9,7 @@
    17.4  l:startv({
    17.5      caps = {
    17.6        pipeserver = pipe_server:svr(),
    17.7 +      jdb = L4.Env.jdb, -- to set the server name
    17.8      },
    17.9      log = { "server", "r" },
   17.10    },
    18.1 --- a/conf/dstest_test_client.cfg	Fri Mar 17 18:34:18 2023 +0100
    18.2 +++ b/conf/dstest_test_client.cfg	Fri Mar 17 22:43:44 2023 +0100
    18.3 @@ -9,6 +9,7 @@
    18.4  l:startv({
    18.5      caps = {
    18.6        fsserver = test_server:svr(),
    18.7 +      jdb = L4.Env.jdb, -- to set the server name
    18.8      },
    18.9      log = { "server", "r" },
   18.10    },
    19.1 --- a/servers/block_file_server.cc	Fri Mar 17 18:34:18 2023 +0100
    19.2 +++ b/servers/block_file_server.cc	Fri Mar 17 22:43:44 2023 +0100
    19.3 @@ -19,6 +19,7 @@
    19.4   * Boston, MA  02110-1301, USA
    19.5   */
    19.6  
    19.7 +#include <l4/sys/debugger.h>
    19.8  #include <l4/sys/err.h>
    19.9  
   19.10  #include <ipc/thread.h>
   19.11 @@ -45,6 +46,7 @@
   19.12  
   19.13  int main(int argc, char *argv[])
   19.14  {
   19.15 +  l4_debugger_set_object_name(l4re_env()->main_thread, "block_server");
   19.16    long err;
   19.17  
   19.18    /* Introduce concurrency control. */
    20.1 --- a/servers/client_file_server.cc	Fri Mar 17 18:34:18 2023 +0100
    20.2 +++ b/servers/client_file_server.cc	Fri Mar 17 22:43:44 2023 +0100
    20.3 @@ -20,6 +20,7 @@
    20.4   * Boston, MA  02110-1301, USA
    20.5   */
    20.6  
    20.7 +#include <l4/sys/debugger.h>
    20.8  #include <l4/sys/err.h>
    20.9  
   20.10  #include <ipc/thread.h>
   20.11 @@ -46,6 +47,7 @@
   20.12  
   20.13  int main(int argc, char *argv[])
   20.14  {
   20.15 +  l4_debugger_set_object_name(l4re_env()->main_thread, "client_server");
   20.16    long err;
   20.17  
   20.18    /* Introduce concurrency control. */
    21.1 --- a/servers/ext2_file_server.cc	Fri Mar 17 18:34:18 2023 +0100
    21.2 +++ b/servers/ext2_file_server.cc	Fri Mar 17 22:43:44 2023 +0100
    21.3 @@ -19,6 +19,7 @@
    21.4   * Boston, MA  02110-1301, USA
    21.5   */
    21.6  
    21.7 +#include <l4/sys/debugger.h>
    21.8  #include <l4/sys/err.h>
    21.9  
   21.10  #include <ipc/thread.h>
   21.11 @@ -46,6 +47,8 @@
   21.12  
   21.13  int main(int argc, char *argv[])
   21.14  {
   21.15 +  l4_debugger_set_object_name(l4re_env()->main_thread, "ext2_server");
   21.16 +
   21.17    /* Require filesystem object details. */
   21.18  
   21.19    if (argc < 3)
    22.1 --- a/servers/host_file_server.cc	Fri Mar 17 18:34:18 2023 +0100
    22.2 +++ b/servers/host_file_server.cc	Fri Mar 17 22:43:44 2023 +0100
    22.3 @@ -19,6 +19,7 @@
    22.4   * Boston, MA  02110-1301, USA
    22.5   */
    22.6  
    22.7 +#include <l4/sys/debugger.h>
    22.8  #include <l4/sys/err.h>
    22.9  
   22.10  #include <ipc/thread.h>
   22.11 @@ -45,6 +46,7 @@
   22.12  
   22.13  int main(int argc, char *argv[])
   22.14  {
   22.15 +  l4_debugger_set_object_name(l4re_env()->main_thread, "host_server");
   22.16    long err;
   22.17  
   22.18    /* Introduce concurrency control. */
    23.1 --- a/servers/pipe_server.cc	Fri Mar 17 18:34:18 2023 +0100
    23.2 +++ b/servers/pipe_server.cc	Fri Mar 17 22:43:44 2023 +0100
    23.3 @@ -19,6 +19,8 @@
    23.4   * Boston, MA  02110-1301, USA
    23.5   */
    23.6  
    23.7 +#include <l4/re/env.h>
    23.8 +#include <l4/sys/debugger.h>
    23.9  #include <l4/sys/err.h>
   23.10  
   23.11  #include <ipc/thread.h>
   23.12 @@ -37,6 +39,7 @@
   23.13  
   23.14  int main(int argc, char *argv[])
   23.15  {
   23.16 +  l4_debugger_set_object_name(l4re_env()->main_thread, "pipe_server");
   23.17    long err;
   23.18  
   23.19    /* Introduce concurrency control. */
    24.1 --- a/servers/process_server.cc	Fri Mar 17 18:34:18 2023 +0100
    24.2 +++ b/servers/process_server.cc	Fri Mar 17 22:43:44 2023 +0100
    24.3 @@ -19,6 +19,7 @@
    24.4   * Boston, MA  02110-1301, USA
    24.5   */
    24.6  
    24.7 +#include <l4/sys/debugger.h>
    24.8  #include <l4/sys/err.h>
    24.9  
   24.10  #include <ipc/thread.h>
   24.11 @@ -36,6 +37,8 @@
   24.12  
   24.13  int main(int argc, char *argv[])
   24.14  {
   24.15 +  l4_debugger_set_object_name(l4re_env()->main_thread, "process_server");
   24.16 +
   24.17    if (argc < 2)
   24.18    {
   24.19      printf("Need a region mapper.\n");
    25.1 --- a/servers/test_file_server.cc	Fri Mar 17 18:34:18 2023 +0100
    25.2 +++ b/servers/test_file_server.cc	Fri Mar 17 22:43:44 2023 +0100
    25.3 @@ -19,6 +19,7 @@
    25.4   * Boston, MA  02110-1301, USA
    25.5   */
    25.6  
    25.7 +#include <l4/sys/debugger.h>
    25.8  #include <l4/sys/err.h>
    25.9  
   25.10  #include <ipc/thread.h>
   25.11 @@ -42,6 +43,7 @@
   25.12  
   25.13  int main(int argc, char *argv[])
   25.14  {
   25.15 +  l4_debugger_set_object_name(l4re_env()->main_thread, "test_server");
   25.16    long err;
   25.17  
   25.18    /* Introduce concurrency control. */