diff options
Diffstat (limited to 'tests/lib/cli/common_cli.c')
| -rw-r--r-- | tests/lib/cli/common_cli.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c index 7c9febe2ca..e0981b991a 100644 --- a/tests/lib/cli/common_cli.c +++ b/tests/lib/cli/common_cli.c @@ -1,27 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * generic CLI test helper functions * * Copyright (C) 2015 by David Lamparter, * for Open Source Routing / NetDEF, Inc. - * - * Quagga is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2, or (at your option) any - * later version. - * - * Quagga is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; see the file COPYING; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <zebra.h> -#include "thread.h" +#include "frrevent.h" #include "vty.h" #include "command.h" #include "memory.h" @@ -30,7 +17,7 @@ #include "common_cli.h" -struct thread_master *master; +struct event_loop *master; int dump_args(struct vty *vty, const char *descr, int argc, struct cmd_token *argv[]) @@ -52,7 +39,7 @@ static void vty_do_exit(int isexit) vty_terminate(); nb_terminate(); yang_terminate(); - thread_master_free(master); + event_master_free(master); log_memstats(stderr, "testcli"); if (!isexit) @@ -65,14 +52,14 @@ int test_log_prio = ZLOG_DISABLED; /* main routine. */ int main(int argc, char **argv) { - struct thread thread; + struct event thread; size_t yangcount; /* Set umask before anything for security */ umask(0027); /* master init. */ - master = thread_master_create(NULL); + master = event_master_create(NULL); zlog_aux_init("NONE: ", test_log_prio); @@ -94,8 +81,8 @@ int main(int argc, char **argv) vty_stdio(vty_do_exit); /* Fetch next active thread. */ - while (thread_fetch(master, &thread)) - thread_call(&thread); + while (event_fetch(master, &thread)) + event_call(&thread); /* Not reached. */ exit(0); |