rename tdm-dbg to tdm-monitor

Change-Id: I72ab616f6b0c6365708160633eedd9ab74085d98

diff --git a/client/Makefile.am b/client/Makefile.am
index 739c2f1..becccc6 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -27,18 +27,18 @@ libtdm_client_la_SOURCES = \
        tdm_client.c
 
 ##########################################################################
-### tdm-dbg
+### tdm-monitor
 ##########################################################################
 bin_PROGRAMS = \
-       tdm-dbg
+       tdm-monitor
 
-#tdm-dbg
-tdm_dbg_SOURCES = \
+#tdm-monitor
+tdm_monitor_SOURCES = \
        $(top_srcdir)/protocol/tdm-protocol.c \
-       tdm_dbg.c
-tdm_dbg_LDFLAGS = ${LDFLAGS}
-tdm_dbg_LDADD = $(TDM_CLIENT_LIBS) ../common/libtdm-common.la
-tdm_dbg_CFLAGS = \
+       tdm_monitor.c
+tdm_monitor_LDFLAGS = ${LDFLAGS}
+tdm_monitor_LDADD = $(TDM_CLIENT_LIBS) ../common/libtdm-common.la
+tdm_monitor_CFLAGS = \
        $(TDM_CFLAGS) \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/protocol \

diff --git a/client/tdm_dbg.c b/client/tdm_monitor.c
similarity index 81%
rename from client/tdm_dbg.c
rename to client/tdm_monitor.c
index a6fc0a7..fe69cce 100644 (file)
--- a/client/tdm_dbg.c
+++ b/client/tdm_monitor.c
@@ -50,56 +50,56 @@
        } \
 }
 
-typedef struct _tdm_dbg_info {
+typedef struct _tdm_monitor_info {
        struct wl_display *display;
        struct wl_registry *registry;
        struct wl_tdm *tdm;
-} tdm_dbg_info;
+} tdm_monitor_info;
 
-static tdm_dbg_info td_info;
+static tdm_monitor_info td_info;
 static int done;
 
 static void
-_tdm_dbg_cb_debug_done(void *data, struct wl_tdm *wl_tdm, const char *message)
+_tdm_monitor_cb_debug_done(void *data, struct wl_tdm *wl_tdm, const char *message)
 {
        printf("%s", message);
 
        done = 1;
 }
 
-static const struct wl_tdm_listener  tdm_dbg_listener = {
-       _tdm_dbg_cb_debug_done,
+static const struct wl_tdm_listener  tdm_monitor_listener = {
+       _tdm_monitor_cb_debug_done,
 };
 
 static void
-_tdm_dbg_cb_global(void *data, struct wl_registry *registry,
-                                  uint32_t name, const char *interface,
-                                  uint32_t version)
+_tdm_monitor_cb_global(void *data, struct wl_registry *registry,
+                                          uint32_t name, const char *interface,
+                                          uint32_t version)
 {
-       tdm_dbg_info *info = data;
+       tdm_monitor_info *info = data;
 
        if (strncmp(interface, "wl_tdm", 6) == 0) {
                info->tdm = wl_registry_bind(registry, name, &wl_tdm_interface, version);
                exit_if_fail(info->tdm != NULL);
-               wl_tdm_add_listener(info->tdm, &tdm_dbg_listener, info);
+               wl_tdm_add_listener(info->tdm, &tdm_monitor_listener, info);
                wl_display_flush(info->display);
        }
 }
 
 static void
-_tdm_dbg_cb_global_remove(void *data, struct wl_registry *registry, uint32_t name)
+_tdm_monitor_cb_global_remove(void *data, struct wl_registry *registry, uint32_t name)
 {
 }
 
-static const struct wl_registry_listener tdm_dbg_registry_listener = {
-       _tdm_dbg_cb_global,
-       _tdm_dbg_cb_global_remove
+static const struct wl_registry_listener tdm_monitor_registry_listener = {
+       _tdm_monitor_cb_global,
+       _tdm_monitor_cb_global_remove
 };
 
 int
 main(int argc, char ** argv)
 {
-       tdm_dbg_info *info = &td_info;
+       tdm_monitor_info *info = &td_info;
        int i, ret = 0;
        char cwd[1024];
        char options[1024];
@@ -124,7 +124,7 @@ main(int argc, char ** argv)
        exit_if_fail(info->registry != NULL);
 
        wl_registry_add_listener(info->registry,
-                                                        &tdm_dbg_registry_listener, info);
+                                                        &tdm_monitor_registry_listener, info);
        wl_display_roundtrip(info->display);
        exit_if_fail(info->tdm != NULL);
 

diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec
index 536cd8e..070e174 100644 (file)
--- a/packaging/libtdm.spec
+++ b/packaging/libtdm.spec
@@ -93,7 +93,7 @@ rm -f %{_unitdir_user}/default.target.wants/tdm-socket-user.path
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_SHARE}/license/%{name}
 %{_libdir}/libtdm.so.*
-%attr(750,root,root) %{_bindir}/tdm-dbg
+%attr(750,root,root) %{_bindir}/tdm-monitor
 %{_unitdir}/tdm-socket.path
 %{_unitdir}/tdm-socket.service
 %{_unitdir_user}/tdm-socket-user.path

diff --git a/src/Makefile.am b/src/Makefile.am
index 2af9638..2d6f458 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,5 +22,5 @@ libtdm_la_SOURCES = \
        tdm_display.c \
        tdm_pp.c \
        tdm_capture.c \
-       tdm_dbg_server.c \
+       tdm_monitor_server.c \
        tdm.c

diff --git a/src/tdm_dbg_server.c b/src/tdm_monitor_server.c
similarity index 81%
rename from src/tdm_dbg_server.c
rename to src/tdm_monitor_server.c
index 83ea135..a3683fd 100644 (file)
--- a/src/tdm_dbg_server.c
+++ b/src/tdm_monitor_server.c
@@ -45,16 +45,16 @@
 
 #define TDM_DBG_SERVER_ARGS_MAX                32
 
-static void _tdm_dbg_server_usage(char *app_name, char *reply, int *len);
+static void _tdm_monitor_server_usage(char *app_name, char *reply, int *len);
 
 static void
-_tdm_dbg_server_query(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
+_tdm_monitor_server_query(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
 {
        tdm_helper_get_display_information(dpy, reply, len);
 }
 
 static void
-_tdm_dbg_server_dpms(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
+_tdm_monitor_server_dpms(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
 {
        tdm_output *output;
        int output_idx, dpms_value;
@@ -63,7 +63,7 @@ _tdm_dbg_server_dpms(unsigned int pid, char *cwd, int argc, char *argv[], char *
        tdm_error ret;
 
        if (argc < 3) {
-               _tdm_dbg_server_usage(argv[0], reply, len);
+               _tdm_monitor_server_usage(argv[0], reply, len);
                return;
        }
 
@@ -87,14 +87,14 @@ _tdm_dbg_server_dpms(unsigned int pid, char *cwd, int argc, char *argv[], char *
 }
 
 static void
-_tdm_dbg_server_debug(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
+_tdm_monitor_server_debug(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
 {
        int level;
        char *arg;
        char *end;
 
        if (argc < 3) {
-               _tdm_dbg_server_usage(argv[0], reply, len);
+               _tdm_monitor_server_usage(argv[0], reply, len);
                return;
        }
 
@@ -114,14 +114,14 @@ _tdm_dbg_server_debug(unsigned int pid, char *cwd, int argc, char *argv[], char
 }
 
 static void
-_tdm_dbg_server_log_path(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
+_tdm_monitor_server_log_path(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
 {
        static int old_stdout = -1;
        char fd_name[TDM_PATH_LEN];
        char *path;
 
        if (argc < 3) {
-               _tdm_dbg_server_usage(argv[0], reply, len);
+               _tdm_monitor_server_usage(argv[0], reply, len);
                return;
        }
 
@@ -160,7 +160,7 @@ done:
 }
 
 static void
-_tdm_dbg_server_prop(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
+_tdm_monitor_server_prop(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
 {
        tdm_output *output;
        tdm_output *layer = NULL;
@@ -175,7 +175,7 @@ _tdm_dbg_server_prop(unsigned int pid, char *cwd, int argc, char *argv[], char *
        const tdm_prop *props;
 
        if (argc < 3) {
-               _tdm_dbg_server_usage(argv[0], reply, len);
+               _tdm_monitor_server_usage(argv[0], reply, len);
                return;
        }
 
@@ -245,10 +245,10 @@ _tdm_dbg_server_prop(unsigned int pid, char *cwd, int argc, char *argv[], char *
 }
 
 static void
-_tdm_dbg_server_dump(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
+_tdm_monitor_server_dump(unsigned int pid, char *cwd, int argc, char *argv[], char *reply, int *len, tdm_display *dpy)
 {
        if (argc < 3) {
-               _tdm_dbg_server_usage(argv[0], reply, len);
+               _tdm_monitor_server_usage(argv[0], reply, len);
                return;
        }
 
@@ -265,33 +265,33 @@ static struct {
        const char *ex;
 } option_proc[] = {
        {
-               "info", _tdm_dbg_server_query,
+               "info", _tdm_monitor_server_query,
                "show tdm output, layer information", NULL, NULL
        },
        {
-               "dpms", _tdm_dbg_server_dpms,
+               "dpms", _tdm_monitor_server_dpms,
                "set output dpms", "<output_idx>:<dpms>", "0:3 or 0:0"
        },
        {
-               "debug", _tdm_dbg_server_debug,
+               "debug", _tdm_monitor_server_debug,
                "set the debug level and modules(none,mutex,buffer,thread,vblank)",
                "<level>[@<module1>[,<module2>]]",
                NULL
        },
        {
-               "log_path", _tdm_dbg_server_log_path,
+               "log_path", _tdm_monitor_server_log_path,
                "set the log path (console,dlog,filepath)",
                "<path>",
                "console"
        },
        {
-               "prop", _tdm_dbg_server_prop,
+               "prop", _tdm_monitor_server_prop,
                "set the property of a output or a layer",
                "<output_idx>[,<layer_idx>]:<prop_name>,<value>",
                NULL
        },
        {
-               "dump", _tdm_dbg_server_dump,
+               "dump", _tdm_monitor_server_dump,
                "dump buffers (type: layer, pp, capture, none)",
                "<object_type1>[,<object_type2>[,...]]",
                NULL
@@ -299,7 +299,7 @@ static struct {
 };
 
 static void
-_tdm_dbg_server_usage(char *app_name, char *reply, int *len)
+_tdm_monitor_server_usage(char *app_name, char *reply, int *len)
 {
        int opt_size = sizeof(option_proc) / sizeof(option_proc[0]);
        int i;
@@ -317,13 +317,13 @@ _tdm_dbg_server_usage(char *app_name, char *reply, int *len)
 }
 
 static void
-_tdm_dbg_server_command(unsigned int pid, char *cwd, tdm_display *dpy, int argc, char *argv[], char *reply, int *len)
+_tdm_monitor_server_command(unsigned int pid, char *cwd, tdm_display *dpy, int argc, char *argv[], char *reply, int *len)
 {
        int opt_size = sizeof(option_proc) / sizeof(option_proc[0]);
        int i;
 
        if (argc < 2) {
-               _tdm_dbg_server_usage(argv[0], reply, len);
+               _tdm_monitor_server_usage(argv[0], reply, len);
                return;
        }
 
@@ -339,13 +339,13 @@ _tdm_dbg_server_command(unsigned int pid, char *cwd, tdm_display *dpy, int argc,
                }
        }
 
-       _tdm_dbg_server_usage(argv[0], reply, len);
+       _tdm_monitor_server_usage(argv[0], reply, len);
        return;
 }
 
 
 INTERN void
-tdm_dbg_server_command(tdm_display *dpy, const char *options, char *reply, int *len)
+tdm_monitor_server_command(tdm_display *dpy, const char *options, char *reply, int *len)
 {
        unsigned int pid;
        char cwd[1024];
@@ -359,14 +359,14 @@ tdm_dbg_server_command(tdm_display *dpy, const char *options, char *reply, int *
 
        arg = strtok_r(temp, " ", &end);
        if (!arg) {
-               TDM_SNPRINTF(reply, len, "no pid for tdm-dbg");
+               TDM_SNPRINTF(reply, len, "no pid for tdm-monitor");
                return;
        }
        pid = strtol(arg, &e, 10);
 
        arg = strtok_r(NULL, " ", &end);
        if (!arg) {
-               TDM_SNPRINTF(reply, len, "no cwd for tdm-dbg");
+               TDM_SNPRINTF(reply, len, "no cwd for tdm-monitor");
                return;
        }
        snprintf(cwd, sizeof(cwd), "%s", arg);
@@ -377,11 +377,11 @@ tdm_dbg_server_command(tdm_display *dpy, const char *options, char *reply, int *
        while (argv[argc]) {
                argc++;
                if (argc == TDM_DBG_SERVER_ARGS_MAX) {
-                       TDM_SNPRINTF(reply, len, "too many arguments for tdm-dbg");
+                       TDM_SNPRINTF(reply, len, "too many arguments for tdm-monitor");
                        break;
                }
                argv[argc] = strtok_r(NULL, " ", &end);
        }
 
-       _tdm_dbg_server_command(pid, cwd, dpy, argc, argv, reply, len);
+       _tdm_monitor_server_command(pid, cwd, dpy, argc, argv, reply, len);
 }

diff --git a/src/tdm_private.h b/src/tdm_private.h
index a15ffc5..21649b6 100644 (file)
--- a/src/tdm_private.h
+++ b/src/tdm_private.h
@@ -579,7 +579,7 @@ tdm_error
 tdm_vblank_wait(tdm_vblank *vblank, unsigned int req_sec, unsigned int req_usec, unsigned int interval, tdm_vblank_handler func, void *user_data);
 
 void
-tdm_dbg_server_command(tdm_display *dpy, const char *options, char *reply, int *len);
+tdm_monitor_server_command(tdm_display *dpy, const char *options, char *reply, int *len);
 
 #ifdef __cplusplus
 }

diff --git a/src/tdm_server.c b/src/tdm_server.c
index ab6467e..ef45abe 100644 (file)
--- a/src/tdm_server.c
+++ b/src/tdm_server.c
@@ -424,7 +424,7 @@ _tdm_server_cb_debug(struct wl_client *client, struct wl_resource *resource, con
        char message[TDM_SERVER_REPLY_MSG_LEN];
        int size = sizeof(message);
 
-       tdm_dbg_server_command(private_loop->dpy, options, message, &size);
+       tdm_monitor_server_command(private_loop->dpy, options, message, &size);
        wl_tdm_send_debug_done(resource, message);
 }