daemon/app_supervisor.c

   1 /* -*- Mode: C ; c-basic-offset: 2 -*- */
   2 /*
   3  * LADI Session Handler (ladish)
   4  *
   5  * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
   6  *
   7  **************************************************************************
   8  * This file contains implementation of app supervisor object
   9  **************************************************************************
  10  *
  11  * LADI Session Handler is free software; you can redistribute it and/or modify
  12  * it under the terms of the GNU General Public License as published by
  13  * the Free Software Foundation; either version 2 of the License, or
  14  * (at your option) any later version.
  15  *
  16  * LADI Session Handler is distributed in the hope that it will be useful,
  17  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  18  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  19  * GNU General Public License for more details.
  20  *
  21  * You should have received a copy of the GNU General Public License
  22  * along with LADI Session Handler. If not, see <http://www.gnu.org/licenses/>
  23  * or write to the Free Software Foundation, Inc.,
  24  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  25  */
  26
  27 #include <ctype.h>
  28 #include <sys/types.h>
  29 #include <signal.h>
  30
  31 #include "app_supervisor.h"
  32 #include "../dbus/error.h"
  33 #include "../dbus_constants.h"
  34 #include "loader.h"
  35
  36 struct ladish_app
  37 {
  38   struct list_head siblings;
  39   uint64_t id;
  40   char * name;
  41   char * commandline;
  42   bool terminal;
  43   uint8_t level;
  44   pid_t pid;
  45   bool zombie;
  46   bool hidden;
  47   bool autorun;
  48 };
  49
  50 struct ladish_app_supervisor
  51 {
  52   char * name;
  53   char * opath;
  54   uint64_t version;
  55   uint64_t next_id;
  56   struct list_head applist;
  57 };
  58
  59 bool ladish_app_supervisor_create(ladish_app_supervisor_handle * supervisor_handle_ptr, const char * opath, const char * name)
  60 {
  61   struct ladish_app_supervisor * supervisor_ptr;
  62
  63   supervisor_ptr = malloc(sizeof(struct ladish_app_supervisor));
  64   if (supervisor_ptr == NULL)
  65   {
  66     log_error("malloc() failed to allocate struct ladish_app_supervisor");
  67     return false;
  68   }
  69
  70   supervisor_ptr->opath = strdup(opath);
  71   if (supervisor_ptr->opath == NULL)
  72   {
  73     log_error("strdup() failed for app supervisor opath");
  74     free(supervisor_ptr);
  75     return false;
  76   }
  77
  78   supervisor_ptr->name = strdup(name);
  79   if (supervisor_ptr->name == NULL)
  80   {
  81     log_error("strdup() failed for app supervisor name");
  82     free(supervisor_ptr->opath);
  83     free(supervisor_ptr);
  84     return false;
  85   }
  86
  87   supervisor_ptr->version = 0;
  88   supervisor_ptr->next_id = 1;
  89
  90   INIT_LIST_HEAD(&supervisor_ptr->applist);
  91
  92   *supervisor_handle_ptr = (ladish_app_supervisor_handle)supervisor_ptr;
  93
  94   return true;
  95 }
  96
  97 struct ladish_app * ladish_app_supervisor_find_app_by_name(struct ladish_app_supervisor * supervisor_ptr, const char * name)
  98 {
  99   struct list_head * node_ptr;
 100   struct ladish_app * app_ptr;
 101
 102   list_for_each(node_ptr, &supervisor_ptr->applist)
 103   {
 104     app_ptr = list_entry(node_ptr, struct ladish_app, siblings);
 105     if (strcmp(app_ptr->name, name) == 0)
 106     {
 107       return app_ptr;
 108     }
 109   }
 110
 111   return NULL;
 112 }
 113
 114 struct ladish_app * ladish_app_supervisor_find_app_by_id(struct ladish_app_supervisor * supervisor_ptr, uint64_t id)
 115 {
 116   struct list_head * node_ptr;
 117   struct ladish_app * app_ptr;
 118
 119   list_for_each(node_ptr, &supervisor_ptr->applist)
 120   {
 121     app_ptr = list_entry(node_ptr, struct ladish_app, siblings);
 122     if (app_ptr->id == id)
 123     {
 124       return app_ptr;
 125     }
 126   }
 127
 128   return NULL;
 129 }
 130
 131 static
 132 struct ladish_app *
 133 add_app_internal(
 134   struct ladish_app_supervisor * supervisor_ptr,
 135   const char * name,
 136   const char * commandline,
 137   dbus_bool_t terminal,
 138   dbus_bool_t autorun,
 139   uint8_t level)
 140 {
 141   struct ladish_app * app_ptr;
 142   dbus_bool_t running;
 143
 144   app_ptr = malloc(sizeof(struct ladish_app));
 145   if (app_ptr == NULL)
 146   {
 147     log_error("malloc of struct ladish_app failed");
 148     return NULL;
 149   }
 150
 151   app_ptr->name = strdup(name);
 152   if (app_ptr->name == NULL)
 153   {
 154     log_error("strdup() failed for app name");
 155     free(app_ptr);
 156     return NULL;
 157   }
 158
 159   app_ptr->commandline = strdup(commandline);
 160   if (app_ptr->commandline == NULL)
 161   {
 162     log_error("strdup() failed for app commandline");
 163     free(app_ptr->name);
 164     free(app_ptr);
 165     return NULL;
 166   }
 167
 168   app_ptr->terminal = terminal;
 169   app_ptr->level = level;
 170   app_ptr->pid = 0;
 171
 172   app_ptr->id = supervisor_ptr->next_id++;
 173   app_ptr->zombie = false;
 174   app_ptr->hidden = false;
 175   app_ptr->autorun = autorun;
 176   list_add_tail(&app_ptr->siblings, &supervisor_ptr->applist);
 177
 178   running = false;
 179   dbus_signal_emit(
 180     g_dbus_connection,
 181     supervisor_ptr->opath,
 182     IFACE_APP_SUPERVISOR,
 183     "AppAdded",
 184     "ttsbby",
 185     &supervisor_ptr->version,
 186     &app_ptr->id,
 187     &app_ptr->name,
 188     &running,
 189     &terminal,
 190     &app_ptr->level);
 191
 192   return app_ptr;
 193 }
 194
 195 void remove_app_internal(struct ladish_app_supervisor * supervisor_ptr, struct ladish_app * app_ptr)
 196 {
 197   list_del(&app_ptr->siblings);
 198
 199   if (!app_ptr->hidden)
 200   {
 201     dbus_signal_emit(
 202       g_dbus_connection,
 203       supervisor_ptr->opath,
 204       IFACE_APP_SUPERVISOR,
 205       "AppRemoved",
 206       "tt",
 207       &supervisor_ptr->version,
 208       &app_ptr->id);
 209   }
 210
 211   free(app_ptr->name);
 212   free(app_ptr->commandline);
 213   free(app_ptr);
 214 }
 215
 216 void emit_app_state_changed(struct ladish_app_supervisor * supervisor_ptr, struct ladish_app * app_ptr)
 217 {
 218   dbus_bool_t running;
 219   dbus_bool_t terminal;
 220
 221   if (app_ptr->hidden)
 222   {
 223     return;
 224   }
 225
 226   running = app_ptr->pid != 0;
 227   terminal = app_ptr->terminal;
 228
 229   dbus_signal_emit(
 230     g_dbus_connection,
 231     supervisor_ptr->opath,
 232     IFACE_APP_SUPERVISOR,
 233     "AppStateChanged",
 234     "tsbby",
 235     &app_ptr->id,
 236     &app_ptr->name,
 237     &running,
 238     &terminal,
 239     &app_ptr->level);
 240 }
 241
 242 #define supervisor_ptr ((struct ladish_app_supervisor *)supervisor_handle)
 243
 244 void ladish_app_supervisor_clear(ladish_app_supervisor_handle supervisor_handle)
 245 {
 246   struct list_head * node_ptr;
 247   struct list_head * safe_node_ptr;
 248   struct ladish_app * app_ptr;
 249
 250   list_for_each_safe(node_ptr, safe_node_ptr, &supervisor_ptr->applist)
 251   {
 252     app_ptr = list_entry(node_ptr, struct ladish_app, siblings);
 253     if (app_ptr->pid != 0)
 254     {
 255       log_info("terminating '%s'...", app_ptr->name);
 256       app_ptr->zombie = true;
 257       kill(app_ptr->pid, SIGTERM);
 258     }
 259     else
 260     {
 261       log_info("removing '%s'", app_ptr->name);
 262       remove_app_internal(supervisor_ptr, app_ptr);
 263     }
 264   }
 265 }
 266
 267 void ladish_app_supervisor_destroy(ladish_app_supervisor_handle supervisor_handle)
 268 {
 269   ladish_app_supervisor_clear(supervisor_handle);
 270   free(supervisor_ptr->name);
 271   free(supervisor_ptr->opath);
 272   free(supervisor_ptr);
 273 }
 274
 275 bool ladish_app_supervisor_child_exit(ladish_app_supervisor_handle supervisor_handle, pid_t pid)
 276 {
 277   struct list_head * node_ptr;
 278   struct ladish_app * app_ptr;
 279
 280   list_for_each(node_ptr, &supervisor_ptr->applist)
 281   {
 282     app_ptr = list_entry(node_ptr, struct ladish_app, siblings);
 283     if (app_ptr->pid == pid)
 284     {
 285       log_info("exit of studio child '%s' detected.", app_ptr->name);
 286
 287       app_ptr->pid = 0;
 288       if (app_ptr->zombie)
 289       {
 290         remove_app_internal(supervisor_ptr, app_ptr);
 291       }
 292       else
 293       {
 294         emit_app_state_changed(supervisor_ptr, app_ptr);
 295       }
 296
 297       return true;
 298     }
 299   }
 300
 301   return false;
 302 }
 303
 304 bool
 305 ladish_app_supervisor_enum(
 306   ladish_app_supervisor_handle supervisor_handle,
 307   void * context,
 308   bool (* callback)(void * context, const char * name, bool running, const char * command, bool terminal, uint8_t level))
 309 {
 310   struct list_head * node_ptr;
 311   struct ladish_app * app_ptr;
 312
 313   list_for_each(node_ptr, &supervisor_ptr->applist)
 314   {
 315     app_ptr = list_entry(node_ptr, struct ladish_app, siblings);
 316
 317     if (app_ptr->hidden)
 318     {
 319       continue;
 320     }
 321
 322     if (!callback(context, app_ptr->name, app_ptr->pid != 0, app_ptr->commandline, app_ptr->terminal, app_ptr->level))
 323     {
 324       return false;
 325     }
 326   }
 327
 328   return true;
 329 }
 330
 331 bool
 332 ladish_app_supervisor_add(
 333   ladish_app_supervisor_handle supervisor_handle,
 334   const char * name,
 335   bool autorun,
 336   const char * command,
 337   bool terminal,
 338   uint8_t level)
 339 {
 340   struct ladish_app * app_ptr;
 341
 342   app_ptr = add_app_internal(supervisor_ptr, name, command, terminal, autorun, level);
 343   if (app_ptr == NULL)
 344   {
 345     log_error("add_app_internal() failed");
 346     return false;
 347   }
 348
 349   return true;
 350 }
 351
 352 void ladish_app_supervisor_autorun(ladish_app_supervisor_handle supervisor_handle)
 353 {
 354   struct list_head * node_ptr;
 355   struct ladish_app * app_ptr;
 356
 357   list_for_each(node_ptr, &supervisor_ptr->applist)
 358   {
 359     app_ptr = list_entry(node_ptr, struct ladish_app, siblings);
 360
 361     if (!app_ptr->autorun)
 362     {
 363       continue;
 364     }
 365
 366     app_ptr->autorun = false;
 367
 368     log_info("autorun('%s', %s, '%s') called", app_ptr->name, app_ptr->terminal ? "terminal" : "shell", app_ptr->commandline);
 369
 370     if (!loader_execute(supervisor_ptr->name, app_ptr->name, "/", app_ptr->terminal, app_ptr->commandline, &app_ptr->pid))
 371     {
 372       log_error("Execution of '%s' failed",  app_ptr->commandline);
 373       return;
 374     }
 375
 376     emit_app_state_changed(supervisor_ptr, app_ptr);
 377   }
 378 }
 379
 380 #undef supervisor_ptr
 381 #define supervisor_ptr ((struct ladish_app_supervisor *)call_ptr->iface_context)
 382
 383 static void get_all(struct dbus_method_call * call_ptr)
 384 {
 385   DBusMessageIter iter, array_iter, struct_iter;
 386   struct list_head * node_ptr;
 387   struct ladish_app * app_ptr;
 388   dbus_bool_t running;
 389   dbus_bool_t terminal;
 390
 391   log_info("get_all called");
 392
 393   call_ptr->reply = dbus_message_new_method_return(call_ptr->message);
 394   if (call_ptr->reply == NULL)
 395   {
 396     goto fail;
 397   }
 398
 399   dbus_message_iter_init_append(call_ptr->reply, &iter);
 400
 401   if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_UINT64, &supervisor_ptr->version))
 402   {
 403     goto fail_unref;
 404   }
 405
 406   if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(tsbby)", &array_iter))
 407   {
 408     goto fail_unref;
 409   }
 410
 411   list_for_each(node_ptr, &supervisor_ptr->applist)
 412   {
 413     app_ptr = list_entry(node_ptr, struct ladish_app, siblings);
 414
 415     if (app_ptr->hidden)
 416     {
 417       continue;
 418     }
 419
 420     log_info("app '%s' (%llu)", app_ptr->name, (unsigned long long)app_ptr->id);
 421
 422     if (!dbus_message_iter_open_container (&array_iter, DBUS_TYPE_STRUCT, NULL, &struct_iter))
 423     {
 424       goto fail_unref;
 425     }
 426
 427     if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_UINT64, &app_ptr->id))
 428     {
 429       goto fail_unref;
 430     }
 431
 432     if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_STRING, &app_ptr->name))
 433     {
 434       goto fail_unref;
 435     }
 436
 437     running = app_ptr->pid != 0;
 438     if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_BOOLEAN, &running))
 439     {
 440       goto fail_unref;
 441     }
 442
 443     terminal = app_ptr->terminal;
 444     if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_BOOLEAN, &terminal))
 445     {
 446       goto fail_unref;
 447     }
 448
 449     if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_BYTE, &app_ptr->level))
 450     {
 451       goto fail_unref;
 452     }
 453
 454     if (!dbus_message_iter_close_container(&array_iter, &struct_iter))
 455     {
 456       goto fail_unref;
 457     }
 458   }
 459
 460   if (!dbus_message_iter_close_container(&iter, &array_iter))
 461   {
 462     goto fail_unref;
 463   }
 464
 465   return;
 466
 467 fail_unref:
 468   dbus_message_unref(call_ptr->reply);
 469   call_ptr->reply = NULL;
 470
 471 fail:
 472   log_error("Ran out of memory trying to construct method return");
 473 }
 474
 475 static void run_custom(struct dbus_method_call * call_ptr)
 476 {
 477   dbus_bool_t terminal;
 478   const char * commandline;
 479   const char * name_param;
 480   char * name;
 481   size_t len;
 482   char * end;
 483   unsigned int index;
 484   struct ladish_app * app_ptr;
 485
 486   if (!dbus_message_get_args(
 487         call_ptr->message,
 488         &g_dbus_error,
 489         DBUS_TYPE_BOOLEAN, &terminal,
 490         DBUS_TYPE_STRING, &commandline,
 491         DBUS_TYPE_STRING, &name_param,
 492         DBUS_TYPE_INVALID))
 493   {
 494     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Invalid arguments to method \"%s\": %s",  call_ptr->method_name, g_dbus_error.message);
 495     dbus_error_free(&g_dbus_error);
 496     return;
 497   }
 498
 499   log_info("run_custom('%s', %s, '%s') called", name_param, terminal ? "terminal" : "shell", commandline);
 500
 501   if (*name_param)
 502   {
 503     /* allocate and copy app name */
 504     len = strlen(name_param);
 505     name = malloc(len + 100);
 506     if (name == NULL)
 507     {
 508       lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "malloc of app name failed");
 509       return;
 510     }
 511
 512     strcpy(name, name_param);
 513
 514     end = name + len;
 515   }
 516   else
 517   {
 518     /* allocate app name */
 519     len = strlen(commandline) + 100;
 520     name = malloc(len);
 521     if (name == NULL)
 522     {
 523       lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "malloc of app name failed");
 524       return;
 525     }
 526
 527     strcpy(name, commandline);
 528
 529     /* use first word as name */
 530     end = name;
 531     while (*end)
 532     {
 533       if (isspace(*end))
 534       {
 535         *end = 0;
 536         break;
 537       }
 538
 539       end++;
 540     }
 541   }
 542
 543   /* make the app name unique */
 544   index = 2;
 545   while (ladish_app_supervisor_find_app_by_name(supervisor_ptr, name) != NULL)
 546   {
 547     sprintf(end, "-%u", index);
 548     index++;
 549   }
 550
 551   app_ptr = add_app_internal(supervisor_ptr, name, commandline, terminal, false, 0);
 552   if (app_ptr == NULL)
 553   {
 554     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "add_app_internal() failed");
 555     free(name);
 556     return;
 557   }
 558
 559   if (!loader_execute(supervisor_ptr->name, name, "/", terminal, commandline, &app_ptr->pid))
 560   {
 561     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "Execution of '%s' failed",  commandline);
 562     remove_app_internal(supervisor_ptr, app_ptr);
 563     free(name);
 564     return;
 565   }
 566
 567   log_info("%s pid is %lu", app_ptr->name, (unsigned long)app_ptr->pid);
 568
 569   emit_app_state_changed(supervisor_ptr, app_ptr);
 570
 571   method_return_new_void(call_ptr);
 572 }
 573
 574 static void start_app(struct dbus_method_call * call_ptr)
 575 {
 576   uint64_t id;
 577   struct ladish_app * app_ptr;
 578
 579   if (!dbus_message_get_args(
 580         call_ptr->message,
 581         &g_dbus_error,
 582         DBUS_TYPE_UINT64, &id,
 583         DBUS_TYPE_INVALID))
 584   {
 585     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Invalid arguments to method \"%s\": %s",  call_ptr->method_name, g_dbus_error.message);
 586     dbus_error_free(&g_dbus_error);
 587     return;
 588   }
 589
 590   app_ptr = ladish_app_supervisor_find_app_by_id(supervisor_ptr, id);
 591   if (app_ptr == NULL)
 592   {
 593     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "App with ID %"PRIu64" not found", id);
 594     return;
 595   }
 596
 597   if (app_ptr->pid != 0)
 598   {
 599     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "App %s is already running", app_ptr->name);
 600     return;
 601   }
 602
 603   app_ptr->zombie = false;
 604   if (!loader_execute(supervisor_ptr->name, app_ptr->name, "/", app_ptr->terminal, app_ptr->commandline, &app_ptr->pid))
 605   {
 606     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "Execution of '%s' failed",  app_ptr->commandline);
 607     return;
 608   }
 609
 610   emit_app_state_changed(supervisor_ptr, app_ptr);
 611   log_info("%s pid is %lu", app_ptr->name, (unsigned long)app_ptr->pid);
 612
 613   method_return_new_void(call_ptr);
 614 }
 615
 616 static void stop_app(struct dbus_method_call * call_ptr)
 617 {
 618   uint64_t id;
 619   struct ladish_app * app_ptr;
 620
 621   if (!dbus_message_get_args(
 622         call_ptr->message,
 623         &g_dbus_error,
 624         DBUS_TYPE_UINT64, &id,
 625         DBUS_TYPE_INVALID))
 626   {
 627     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Invalid arguments to method \"%s\": %s",  call_ptr->method_name, g_dbus_error.message);
 628     dbus_error_free(&g_dbus_error);
 629     return;
 630   }
 631
 632   app_ptr = ladish_app_supervisor_find_app_by_id(supervisor_ptr, id);
 633   if (app_ptr == NULL)
 634   {
 635     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "App with ID %"PRIu64" not found", id);
 636     return;
 637   }
 638
 639   if (app_ptr->pid == 0)
 640   {
 641     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "App %s is not running", app_ptr->name);
 642     return;
 643   }
 644
 645   kill(app_ptr->pid, SIGTERM);
 646
 647   method_return_new_void(call_ptr);
 648 }
 649
 650 static void kill_app(struct dbus_method_call * call_ptr)
 651 {
 652   uint64_t id;
 653   struct ladish_app * app_ptr;
 654
 655   if (!dbus_message_get_args(
 656         call_ptr->message,
 657         &g_dbus_error,
 658         DBUS_TYPE_UINT64, &id,
 659         DBUS_TYPE_INVALID))
 660   {
 661     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Invalid arguments to method \"%s\": %s",  call_ptr->method_name, g_dbus_error.message);
 662     dbus_error_free(&g_dbus_error);
 663     return;
 664   }
 665
 666   app_ptr = ladish_app_supervisor_find_app_by_id(supervisor_ptr, id);
 667   if (app_ptr == NULL)
 668   {
 669     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "App with ID %"PRIu64" not found", id);
 670     return;
 671   }
 672
 673   if (app_ptr->pid == 0)
 674   {
 675     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "App %s is not running", app_ptr->name);
 676     return;
 677   }
 678
 679   kill(app_ptr->pid, SIGKILL);
 680
 681   method_return_new_void(call_ptr);
 682 }
 683
 684 static void get_app_properties(struct dbus_method_call * call_ptr)
 685 {
 686 }
 687
 688 static void set_app_properties(struct dbus_method_call * call_ptr)
 689 {
 690 }
 691
 692 static void remove_app(struct dbus_method_call * call_ptr)
 693 {
 694   uint64_t id;
 695   struct ladish_app * app_ptr;
 696
 697   if (!dbus_message_get_args(
 698         call_ptr->message,
 699         &g_dbus_error,
 700         DBUS_TYPE_UINT64, &id,
 701         DBUS_TYPE_INVALID))
 702   {
 703     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Invalid arguments to method \"%s\": %s",  call_ptr->method_name, g_dbus_error.message);
 704     dbus_error_free(&g_dbus_error);
 705     return;
 706   }
 707
 708   app_ptr = ladish_app_supervisor_find_app_by_id(supervisor_ptr, id);
 709   if (app_ptr == NULL)
 710   {
 711     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "App with ID %"PRIu64" not found", id);
 712     return;
 713   }
 714
 715   if (app_ptr->pid != 0)
 716   {
 717     app_ptr->zombie = true;
 718     kill(app_ptr->pid, SIGTERM);
 719   }
 720   else
 721   {
 722     remove_app_internal(supervisor_ptr, app_ptr);
 723   }
 724
 725   method_return_new_void(call_ptr);
 726 }
 727
 728 static void is_app_running(struct dbus_method_call * call_ptr)
 729 {
 730   uint64_t id;
 731   struct ladish_app * app_ptr;
 732   dbus_bool_t running;
 733
 734   if (!dbus_message_get_args(
 735         call_ptr->message,
 736         &g_dbus_error,
 737         DBUS_TYPE_UINT64, &id,
 738         DBUS_TYPE_INVALID))
 739   {
 740     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Invalid arguments to method \"%s\": %s",  call_ptr->method_name, g_dbus_error.message);
 741     dbus_error_free(&g_dbus_error);
 742     return;
 743   }
 744
 745   app_ptr = ladish_app_supervisor_find_app_by_id(supervisor_ptr, id);
 746   if (app_ptr == NULL)
 747   {
 748     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "App with ID %"PRIu64" not found", id);
 749     return;
 750   }
 751
 752   running = app_ptr->pid != 0;
 753
 754   method_return_new_single(call_ptr, DBUS_TYPE_BOOLEAN, &running);
 755 }
 756
 757 #undef supervisor_ptr
 758
 759 METHOD_ARGS_BEGIN(GetAll, "Get list of apps")
 760   METHOD_ARG_DESCRIBE_OUT("list_version", DBUS_TYPE_UINT64_AS_STRING, "Version of the list")
 761   METHOD_ARG_DESCRIBE_OUT("apps_list", "a(tsbby)", "List of apps")
 762 METHOD_ARGS_END
 763
 764 METHOD_ARGS_BEGIN(RunCustom, "Start application by supplying commandline")
 765   METHOD_ARG_DESCRIBE_IN("terminal", DBUS_TYPE_BOOLEAN_AS_STRING, "Whether to run in terminal")
 766   METHOD_ARG_DESCRIBE_IN("commandline", DBUS_TYPE_STRING_AS_STRING, "Commandline")
 767   METHOD_ARG_DESCRIBE_IN("name", DBUS_TYPE_STRING_AS_STRING, "Name")
 768   METHOD_ARG_DESCRIBE_IN("level", DBUS_TYPE_BYTE_AS_STRING, "Level")
 769 METHOD_ARGS_END
 770
 771 METHOD_ARGS_BEGIN(StartApp, "Start application")
 772   METHOD_ARG_DESCRIBE_IN("id", DBUS_TYPE_UINT64_AS_STRING, "id of app")
 773 METHOD_ARGS_END
 774
 775 METHOD_ARGS_BEGIN(StopApp, "Stop application")
 776   METHOD_ARG_DESCRIBE_IN("id", DBUS_TYPE_UINT64_AS_STRING, "id of app")
 777 METHOD_ARGS_END
 778
 779 METHOD_ARGS_BEGIN(KillApp, "Kill application")
 780   METHOD_ARG_DESCRIBE_IN("id", DBUS_TYPE_UINT64_AS_STRING, "id of app")
 781 METHOD_ARGS_END
 782
 783 METHOD_ARGS_BEGIN(RemoveApp, "Remove application")
 784   METHOD_ARG_DESCRIBE_IN("id", DBUS_TYPE_UINT64_AS_STRING, "id of app")
 785 METHOD_ARGS_END
 786
 787 METHOD_ARGS_BEGIN(GetAppProperties, "Get properties of an application")
 788   METHOD_ARG_DESCRIBE_IN("id", DBUS_TYPE_UINT64_AS_STRING, "id of app")
 789   METHOD_ARG_DESCRIBE_OUT("name", DBUS_TYPE_STRING_AS_STRING, "")
 790   METHOD_ARG_DESCRIBE_OUT("commandline", DBUS_TYPE_STRING_AS_STRING, "Commandline")
 791   METHOD_ARG_DESCRIBE_OUT("terminal", DBUS_TYPE_BOOLEAN_AS_STRING, "Whether to run in terminal")
 792   METHOD_ARG_DESCRIBE_OUT("level", DBUS_TYPE_BYTE_AS_STRING, "Level")
 793 METHOD_ARGS_END
 794
 795 METHOD_ARGS_BEGIN(SetAppProperties, "Set properties of an application")
 796   METHOD_ARG_DESCRIBE_IN("id", DBUS_TYPE_UINT64_AS_STRING, "id of app")
 797   METHOD_ARG_DESCRIBE_IN("name", DBUS_TYPE_STRING_AS_STRING, "")
 798   METHOD_ARG_DESCRIBE_IN("commandline", DBUS_TYPE_STRING_AS_STRING, "Commandline")
 799   METHOD_ARG_DESCRIBE_IN("terminal", DBUS_TYPE_BOOLEAN_AS_STRING, "Whether to run in terminal")
 800   METHOD_ARG_DESCRIBE_IN("level", DBUS_TYPE_BYTE_AS_STRING, "Level")
 801 METHOD_ARGS_END
 802
 803 METHOD_ARGS_BEGIN(IsAppRunning, "Check whether application is running")
 804   METHOD_ARG_DESCRIBE_IN("id", DBUS_TYPE_UINT64_AS_STRING, "id of app")
 805   METHOD_ARG_DESCRIBE_IN("terminal", DBUS_TYPE_BOOLEAN_AS_STRING, "Whether app is running")
 806 METHOD_ARGS_END
 807
 808
 809 METHODS_BEGIN
 810   METHOD_DESCRIBE(GetAll, get_all)
 811   METHOD_DESCRIBE(RunCustom, run_custom)
 812   METHOD_DESCRIBE(StartApp, start_app)
 813   METHOD_DESCRIBE(StopApp, stop_app)
 814   METHOD_DESCRIBE(KillApp, kill_app)
 815   METHOD_DESCRIBE(GetAppProperties, get_app_properties)
 816   METHOD_DESCRIBE(SetAppProperties, set_app_properties)
 817   METHOD_DESCRIBE(RemoveApp, remove_app)
 818   METHOD_DESCRIBE(IsAppRunning, is_app_running)
 819 METHODS_END
 820
 821 SIGNAL_ARGS_BEGIN(AppAdded, "")
 822   SIGNAL_ARG_DESCRIBE("new_list_version", DBUS_TYPE_UINT64_AS_STRING, "")
 823   SIGNAL_ARG_DESCRIBE("id", DBUS_TYPE_UINT64_AS_STRING, "")
 824   SIGNAL_ARG_DESCRIBE("name", DBUS_TYPE_STRING_AS_STRING, "")
 825   SIGNAL_ARG_DESCRIBE("running", DBUS_TYPE_BOOLEAN_AS_STRING, "")
 826   SIGNAL_ARG_DESCRIBE("terminal", DBUS_TYPE_BOOLEAN_AS_STRING, "Whether to run in terminal")
 827   SIGNAL_ARG_DESCRIBE("level", DBUS_TYPE_BYTE_AS_STRING, "Level")
 828 SIGNAL_ARGS_END
 829
 830 SIGNAL_ARGS_BEGIN(AppRemoved, "")
 831   SIGNAL_ARG_DESCRIBE("new_list_version", DBUS_TYPE_UINT64_AS_STRING, "")
 832   SIGNAL_ARG_DESCRIBE("id", DBUS_TYPE_UINT64_AS_STRING, "")
 833 SIGNAL_ARGS_END
 834
 835 SIGNAL_ARGS_BEGIN(AppStateChanged, "")
 836   SIGNAL_ARG_DESCRIBE("id", DBUS_TYPE_UINT64_AS_STRING, "")
 837   SIGNAL_ARG_DESCRIBE("name", DBUS_TYPE_STRING_AS_STRING, "")
 838   SIGNAL_ARG_DESCRIBE("running", DBUS_TYPE_BOOLEAN_AS_STRING, "")
 839   SIGNAL_ARG_DESCRIBE("terminal", DBUS_TYPE_BOOLEAN_AS_STRING, "Whether to run in terminal")
 840   SIGNAL_ARG_DESCRIBE("level", DBUS_TYPE_BYTE_AS_STRING, "Level")
 841 SIGNAL_ARGS_END
 842
 843 SIGNALS_BEGIN
 844   SIGNAL_DESCRIBE(AppAdded)
 845   SIGNAL_DESCRIBE(AppRemoved)
 846   SIGNAL_DESCRIBE(AppStateChanged)
 847 SIGNALS_END
 848
 849 INTERFACE_BEGIN(g_iface_app_supervisor, IFACE_APP_SUPERVISOR)
 850   INTERFACE_DEFAULT_HANDLER
 851   INTERFACE_EXPOSE_METHODS
 852   INTERFACE_EXPOSE_SIGNALS
 853 INTERFACE_END