[ovs-dev] [PATCH 3/3] process: Make changes for Windows.

Gurucharan Shetty shettyg at nicira.com
Fri Feb 14 22:20:43 UTC 2014


As of now, we are using the process subsystem in
ovsdb-server to handle the "--run" command line
option. That particular option is not used often
and till deemed necessary, make is unsupported on
Windows platform.

Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
---
 lib/process.c           |   15 +++++++++++++++
 ovsdb/ovsdb-server.1.in |    2 ++
 ovsdb/ovsdb-server.c    |    2 ++
 3 files changed, 19 insertions(+)

diff --git a/lib/process.c b/lib/process.c
index 82a7693..8a9651e 100644
--- a/lib/process.c
+++ b/lib/process.c
@@ -69,6 +69,7 @@ static void sigchld_handler(int signr OVS_UNUSED);
 void
 process_init(void)
 {
+#ifndef _WIN32
     static bool inited;
     struct sigaction sa;
 
@@ -87,6 +88,7 @@ process_init(void)
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
     xsigaction(SIGCHLD, &sa, NULL);
+#endif
 }
 
 char *
@@ -179,6 +181,7 @@ process_register(const char *name, pid_t pid)
 int
 process_start(char **argv, struct process **pp)
 {
+#ifndef _WIN32
     pid_t pid;
     int error;
 
@@ -213,6 +216,10 @@ process_start(char **argv, struct process **pp)
                 argv[0], ovs_strerror(errno));
         _exit(1);
     }
+#else
+    *pp = NULL;
+    return ENOSYS;
+#endif
 }
 
 /* Destroys process 'p'. */
@@ -250,6 +257,7 @@ process_status(const struct process *p)
 char *
 process_status_msg(int status)
 {
+#ifndef _WIN32
     struct ds ds = DS_EMPTY_INITIALIZER;
     if (WIFEXITED(status)) {
         ds_put_format(&ds, "exit status %d", WEXITSTATUS(status));
@@ -270,12 +278,16 @@ process_status_msg(int status)
         ds_put_cstr(&ds, ", core dumped");
     }
     return ds_cstr(&ds);
+#else
+    return NULL;
+#endif
 }
 
 /* Executes periodic maintenance activities required by the process module. */
 void
 process_run(void)
 {
+#ifndef _WIN32
     char buf[_POSIX_PIPE_BUF];
 
     if (!list_is_empty(&all_processes) && read(fds[0], buf, sizeof buf) > 0) {
@@ -298,6 +310,7 @@ process_run(void)
             }
         }
     }
+#endif
 }
 
 
@@ -306,11 +319,13 @@ process_run(void)
 void
 process_wait(struct process *p)
 {
+#ifndef _WIN32
     if (p->exited) {
         poll_immediate_wake();
     } else {
         poll_fd_wait(fds[0], POLLIN);
     }
+#endif
 }
 
 static char *
diff --git a/ovsdb/ovsdb-server.1.in b/ovsdb/ovsdb-server.1.in
index 6924d42..a4cf344 100644
--- a/ovsdb/ovsdb-server.1.in
+++ b/ovsdb/ovsdb-server.1.in
@@ -88,6 +88,8 @@ otherwise, it exits with exit code 1.
 This option can be useful where a database server is needed only to
 run a single command, e.g.:
 .B "ovsdb\-server \-\-remote=punix:socket \-\-run='ovsdb\-client dump unix:socket Open_vSwitch'"
+.IP
+This option is not supported on Windows platform.
 .SS "Daemon Options"
 .ds DD \
 \fBovsdb\-server\fR detaches only after it starts listening on all \
diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index c24d355..bdcdad9 100644
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -1172,7 +1172,9 @@ parse_options(int *argcp, char **argvp[],
     static const struct option long_options[] = {
         {"remote",      required_argument, NULL, OPT_REMOTE},
         {"unixctl",     required_argument, NULL, OPT_UNIXCTL},
+#ifndef _WIN32
         {"run",         required_argument, NULL, OPT_RUN},
+#endif
         {"help",        no_argument, NULL, 'h'},
         {"version",     no_argument, NULL, 'V'},
         DAEMON_LONG_OPTIONS,
-- 
1.7.9.5




More information about the dev mailing list