Commit 3c6d356e authored by Maria Matejka's avatar Maria Matejka
Browse files

Fixed shutdown routine

parent 635910e7
Loading
Loading
Loading
Loading
+9 −6
Original line number Diff line number Diff line
@@ -150,11 +150,14 @@ cli_parse(struct conf_order *order)
{
  DBG("Parsing command line\n");

  struct config cc = {};
  cc.pool = rp_new(order->pool ?: &root_pool, "CLI Dummy Config");
  cc.mem = order->lp ?: lp_new_default(cc.pool);
  config_add_obstacle(config);
  cc.cli_sym = &(config->sym_hash);
  struct config cc = {}, *gc = config;
  ASSERT_DIE(order->pool);
  ASSERT_DIE(order->lp);
  cc.pool = rp_new(order->pool, "CLI Dummy Config");
  cc.mem = order->lp;

  config_add_obstacle(gc);
  cc.cli_sym = &(gc->sym_hash);
  init_list(&cc.symbols);

  order->new_config = &cc;
@@ -165,7 +168,7 @@ cli_parse(struct conf_order *order)

  cf_free_context(ctx);
  config_free(&cc);
  config_del_obstacle(config);
  config_del_obstacle(gc);
  order->new_config = NULL;
  order->ctx = NULL;
}
+1 −1
Original line number Diff line number Diff line
@@ -2310,7 +2310,7 @@ rt_unlock_table(rtable *r)
{
  if (!--r->use_count && r->deleted)
    {
      ev_cancel(r->rt_event, 0);
      ev_cancel(r->rt_event, 1);
      rfree(r->rt_event);

      struct config *conf = r->deleted;
+1 −0
Original line number Diff line number Diff line
@@ -482,6 +482,7 @@ void ev_schedule_locked(LOCKED(event_state), event *ev)
  if (evu->coro)
  {
    evu->coro->c.flags |= CORO_REPEAT;
    evu->coro->c.flags &= ~CORO_STOP;
    EV_DEBUG(ev, "repeat");
    return;
  }