From 2d1e91ebf4577c6e20554038c51684f50ec29985 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Mon, 13 Aug 2018 14:42:33 +0300
Subject: [PATCH] MXS-2008 Remove MXS_WORKER_MSG_PING

No reason for including that in the worker interface.
---
 include/maxscale/worker.h                   |  9 ---------
 server/core/worker.cc                       | 10 ----------
 server/modules/routing/debugcli/debugcmd.cc | 14 +++++++++++++-
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/include/maxscale/worker.h b/include/maxscale/worker.h
index 597239637..3cb27aa7a 100644
--- a/include/maxscale/worker.h
+++ b/include/maxscale/worker.h
@@ -22,15 +22,6 @@ typedef struct mxs_worker
 
 enum mxs_worker_msg_id
 {
-    /**
-     * Ping message.
-     *
-     * arg1: 0
-     * arg2: NULL or pointer to dynamically allocated NULL-terminated string,
-     *       to be freed by worker.
-     */
-    MXS_WORKER_MSG_PING,
-
     /**
      * Shutdown message.
      *
diff --git a/server/core/worker.cc b/server/core/worker.cc
index b62d07c2e..a4542e526 100644
--- a/server/core/worker.cc
+++ b/server/core/worker.cc
@@ -610,16 +610,6 @@ void Worker::handle_message(MessageQueue& queue, const MessageQueue::Message& ms
 {
     switch  (msg.id())
     {
-    case MXS_WORKER_MSG_PING:
-        {
-            ss_dassert(msg.arg1() == 0);
-            char* zArg2 = reinterpret_cast<char*>(msg.arg2());
-            const char* zMessage = zArg2 ? zArg2 : "Alive and kicking";
-            MXS_NOTICE("Worker[%p]: %s.", this, zMessage);
-            MXS_FREE(zArg2);
-        }
-        break;
-
     case MXS_WORKER_MSG_SHUTDOWN:
         {
             MXS_INFO("Worker %p received shutdown message.", this);
diff --git a/server/modules/routing/debugcli/debugcmd.cc b/server/modules/routing/debugcli/debugcmd.cc
index 1c30428b7..50fa1cc4e 100644
--- a/server/modules/routing/debugcli/debugcmd.cc
+++ b/server/modules/routing/debugcli/debugcmd.cc
@@ -907,9 +907,21 @@ static void cmd_AddServer(DCB *dcb, SERVER *server, char *v1, char *v2, char *v3
 /**
  * The subcommands of the ping command.
  */
+namespace
+{
+
+void ping(MXS_WORKER* worker, void* arg)
+{
+    MXS_NOTICE("Worker[%p]: Alive and kicking.", worker);
+}
+
+}
+
 void ping_workers(DCB* dcb)
 {
-    int n = mxs_rworker_broadcast_message(MXS_WORKER_MSG_PING, 0, 0);
+    intptr_t arg1 = reinterpret_cast<intptr_t>(ping);
+
+    int n = mxs_rworker_broadcast_message(MXS_WORKER_MSG_CALL, arg1, 0);
 
     dcb_printf(dcb, "Broadcasted ping message to %d workers.\n", n);
 }