Skip to content

Commit 609c913

Browse files
igsilyaputnopvut
authored andcommitted
treewide: Remove Windows service handling.
This is one missed bit of the old Windows support. Interestingly, ovn-dbctl and ovn-trace didn't stop their services. Fixes: accc3e7 ("treewide: Remove shards of Windows support.") Acked-by: Alin Gabriel Serdean <aserdean@ovn.org> Signed-off-by: Ilya Maximets <i.maximets@ovn.org> Signed-off-by: Mark Michelson <mmichels@redhat.com>
1 parent 3bae90d commit 609c913

7 files changed

Lines changed: 3 additions & 30 deletions

File tree

br-controller/ovn-br-controller.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
131131

132132
ovs_cmdl_proctitle_init(argc, argv);
133133
ovn_set_program_name(argv[0]);
134-
service_start(&argc, &argv);
135134
char *ovs_remote = parse_options(argc, argv);
136135
fatal_ignore_sigpipe();
137136

@@ -322,9 +321,6 @@ main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
322321
ovsdb_idl_track_clear(ovs_idl_loop.idl);
323322

324323
poll_block();
325-
if (should_service_stop()) {
326-
exit_args.exiting = true;
327-
}
328324
}
329325

330326
engine_set_context(NULL);
@@ -333,7 +329,6 @@ main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
333329
free(ovs_remote);
334330
ovn_exit_args_finish(&exit_args);
335331
unixctl_server_destroy(unixctl);
336-
service_stop();
337332
exit(0);
338333
}
339334

controller-vtep/ovn-controller-vtep.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ main(int argc, char *argv[])
115115

116116
ovs_cmdl_proctitle_init(argc, argv);
117117
ovn_set_program_name(argv[0]);
118-
service_start(&argc, &argv);
119118
parse_options(argc, argv);
120119
fatal_ignore_sigpipe();
121120

@@ -229,9 +228,6 @@ main(int argc, char *argv[])
229228
ovsdb_idl_loop_commit_and_wait(&vtep_idl_loop);
230229
ovsdb_idl_loop_commit_and_wait(&ovnsb_idl_loop);
231230
poll_block();
232-
if (should_service_stop()) {
233-
exiting = true;
234-
}
235231
}
236232

237233
/* It's time to exit. Clean up the databases. */
@@ -267,7 +263,6 @@ main(int argc, char *argv[])
267263
free(ovnsb_remote);
268264
free(vtep_remote);
269265
free(default_db_);
270-
service_stop();
271266

272267
exit(retval);
273268
}

controller/ovn-controller.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7459,7 +7459,6 @@ main(int argc, char *argv[])
74597459

74607460
ovs_cmdl_proctitle_init(argc, argv);
74617461
ovn_set_program_name(argv[0]);
7462-
service_start(&argc, &argv);
74637462
char *ovs_remote = parse_options(argc, argv);
74647463
fatal_ignore_sigpipe();
74657464

@@ -8386,9 +8385,6 @@ main(int argc, char *argv[])
83868385
memory_wait();
83878386
ovsrcu_quiesce_start();
83888387
poll_block();
8389-
if (should_service_stop()) {
8390-
exit_args.exiting = true;
8391-
}
83928388
}
83938389

83948390
const struct ovsrec_open_vswitch_table *ovs_table =
@@ -8496,7 +8492,6 @@ main(int argc, char *argv[])
84968492
free(cli_system_id);
84978493
ovn_exit_args_finish(&exit_args);
84988494
unixctl_server_destroy(unixctl);
8499-
service_stop();
85008495
ovsrcu_exit();
85018496
dns_resolve_destroy();
85028497
route_exchange_destroy();

ic/ovn-ic.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3444,7 +3444,6 @@ main(int argc, char *argv[])
34443444
fatal_ignore_sigpipe();
34453445
ovs_cmdl_proctitle_init(argc, argv);
34463446
ovn_set_program_name(argv[0]);
3447-
service_start(&argc, &argv);
34483447
parse_options(argc, argv);
34493448

34503449
daemonize_start(false, false);
@@ -4063,9 +4062,6 @@ main(int argc, char *argv[])
40634062
}
40644063

40654064
poll_block();
4066-
if (should_service_stop()) {
4067-
exiting = true;
4068-
}
40694065
}
40704066
inc_proc_ic_cleanup();
40714067

@@ -4075,7 +4071,6 @@ main(int argc, char *argv[])
40754071
ovsdb_idl_loop_destroy(&ovninb_idl_loop);
40764072
ovsdb_idl_loop_destroy(&ovnisb_idl_loop);
40774073
ovsdb_idl_loop_destroy(&ovnisb_unlocked_idl_loop);
4078-
service_stop();
40794074

40804075
exit(res);
40814076
}

northd/ovn-northd.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,6 @@ main(int argc, char *argv[])
835835
fatal_ignore_sigpipe();
836836
ovs_cmdl_proctitle_init(argc, argv);
837837
ovn_set_program_name(argv[0]);
838-
service_start(&argc, &argv);
839838
parse_options(argc, argv, &state.paused, &n_threads);
840839

841840
daemonize_start(false, false);
@@ -1217,9 +1216,6 @@ main(int argc, char *argv[])
12171216

12181217
stopwatch_stop(NORTHD_LOOP_STOPWATCH_NAME, time_msec());
12191218
poll_block();
1220-
if (should_service_stop()) {
1221-
exit_args.exiting = true;
1222-
}
12231219
stopwatch_start(NORTHD_LOOP_STOPWATCH_NAME, time_msec());
12241220
}
12251221
inc_proc_northd_cleanup();
@@ -1228,7 +1224,6 @@ main(int argc, char *argv[])
12281224
ovsdb_idl_loop_destroy(&ovnsb_idl_loop);
12291225
ovn_exit_args_finish(&exit_args);
12301226
unixctl_server_destroy(unixctl);
1231-
service_stop();
12321227
run_update_worker_pool(0);
12331228
ovsrcu_exit();
12341229

utilities/ovn-dbctl.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static char * OVS_WARN_UNUSED_RESULT main_loop(
106106
struct ctl_command *commands, size_t n_commands,
107107
struct ovsdb_idl *idl, const struct timer *);
108108
static void server_loop(const struct ovn_dbctl_options *dbctl_options,
109-
struct ovsdb_idl *idl, int argc, char *argv[]);
109+
struct ovsdb_idl *idl);
110110
static void ovn_dbctl_exit(int status);
111111

112112
static void
@@ -209,7 +209,7 @@ ovn_dbctl_main(int argc, char *argv[],
209209
set_idl_probe_interval(idl, db, DEFAULT_UTILS_PROBE_INTERVAL_MSEC);
210210

211211
if (daemon_mode) {
212-
server_loop(dbctl_options, idl, argc, argv_);
212+
server_loop(dbctl_options, idl);
213213
} else {
214214
struct ctl_command *commands;
215215
size_t n_commands;
@@ -1124,12 +1124,11 @@ update_inactivity_probe(struct server_cmd_run_ctx *ctx)
11241124

11251125
static void
11261126
server_loop(const struct ovn_dbctl_options *dbctl_options,
1127-
struct ovsdb_idl *idl, int argc, char *argv[])
1127+
struct ovsdb_idl *idl)
11281128
{
11291129
struct unixctl_server *server = NULL;
11301130
bool exiting = false;
11311131

1132-
service_start(&argc, &argv);
11331132
daemonize_start(false, false);
11341133

11351134
char *abs_unixctl_path = get_abs_unix_ctl_path(unixctl_path);

utilities/ovn-trace.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ int
106106
main(int argc, char *argv[])
107107
{
108108
ovn_set_program_name(argv[0]);
109-
service_start(&argc, &argv);
110109
fatal_ignore_sigpipe();
111110
vlog_set_levels_from_string_assert("reconnect:warn");
112111

0 commit comments

Comments
 (0)