rtapi_app: Add deprecated master autostart

Author: hdiethelm

src/rtapi/uspace_rtapi_main.cc

@@ -922,6 +922,65 @@ static double diff_timespec(const struct timespec *time1, const struct timespec
 static void raise_net_admin_ambient(void);
 #endif
 
+static int create_socket(){
+    int fd = socket(PF_UNIX, SOCK_STREAM, 0);
+    if (fd == -1) {
+        perror("socket");
+        return fd;
+    }
+
+    int enable = 1;
+    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
+    return fd;
+}
+
+static int start_master(int fd){
+    int result = listen(fd, 10);
+    if (result != 0) {
+        perror("listen");
+        return 1;
+    }
+    //Demonize
+    pid_t pid = fork();
+    if (pid < 0){
+        perror("fork");
+        return 1;
+    }
+    if(pid == 0){
+        setsid(); // create a new session if we can...
+        result = master(fd);
+        exit(result);
+    }else{
+        return 0;
+    }
+}
+
+static int run_slave_cmd(struct sockaddr_un *addr, int fd, const std::vector<std::string> &args){
+    int result = -1;
+    struct timespec start, now;
+    clock_gettime(CLOCK_MONOTONIC, &start);
+    clock_gettime(CLOCK_MONOTONIC, &now);
+    srand48(start.tv_sec ^ start.tv_nsec);
+    while (diff_timespec(&now, &start) < 3.0) {
+        result = connect(fd, (sockaddr *)addr, sizeof(*addr));
+        if (result == 0)
+            break;
+
+        usleep((useconds_t)(lrand48() % 100000) + 100); //Random sleep min 100us max 100100us
+        clock_gettime(CLOCK_MONOTONIC, &now);
+    }
+    if (result < 0 && errno == ECONNREFUSED) {
+        fprintf(stderr, "Waited 3 seconds for master.  giving up.\n");
+        close(fd);
+        return 1;
+    }
+    if (result < 0) {
+        fprintf(stderr, "connect %s: %s", addr->sun_path, strerror(errno));
+        return 1;
+    }
+    return slave(fd, args);
+}
+
 int main(int argc, char **argv) {
     if (getuid() == 0) {
         char *fallback_uid_str = getenv("RTAPI_UID");
@@ -960,20 +1019,17 @@ int main(int argc, char **argv) {
         args.push_back(std::string(argv[i]));
     }
 
-    int fd = socket(PF_UNIX, SOCK_STREAM, 0);
-    if (fd == -1) {
-        perror("socket");
-        exit(1);
-    }
-
-    int enable = 1;
-    setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
     struct sockaddr_un addr;
     memset(&addr, 0x0, sizeof(addr));
     addr.sun_family = AF_UNIX;
     if (!get_fifo_path_to_addr(&addr))
         exit(1);
 
+    int fd = create_socket();
+    if (fd < 0) {
+        exit(1);
+    }
+
     // plus one because we use the abstract namespace, it will show up in
     // /proc/net/unix prefixed with an @
     int result = bind(fd, (sockaddr *)&addr, sizeof(addr));
@@ -994,48 +1050,24 @@ int main(int argc, char **argv) {
         }
         //Start a master on start command
         if (args.size() == 1 && args[0] == "start") {
-            int result = listen(fd, 10);
+            result = start_master(fd);
+            exit(result);
+        }else{
+            fprintf(stderr, "WARNING: Deprecated: No master found. Use realtime start to start one.\n"
+                "  A master is started automaticaly.\n");
+            result = start_master(fd);
             if (result != 0) {
-                perror("listen");
-                exit(1);
+                exit(result);
             }
-            //Demonize
-            pid_t pid = fork();
-            if (pid < 0){
-                perror("fork");
+            close(fd); //Need to close the socket, it is already bound and master is using it
+            int fd = create_socket();
+            if (fd < 0) {
                 exit(1);
             }
-            if(pid == 0){
-                setsid(); // create a new session if we can...
-                result = master(fd);
-            }
-            return result;
+            return run_slave_cmd(&addr, fd, args);
         }
-        fprintf(stderr, "error: No master found. Use realtime start to start one.\n");
-        exit(1);
     } else if (errno == EADDRINUSE) {
-        struct timespec start, now;
-        clock_gettime(CLOCK_MONOTONIC, &start);
-        clock_gettime(CLOCK_MONOTONIC, &now);
-        srand48(start.tv_sec ^ start.tv_nsec);
-        while (diff_timespec(&now, &start) < 3.0) {
-            result = connect(fd, (sockaddr *)&addr, sizeof(addr));
-            if (result == 0)
-                break;
-
-            usleep((useconds_t)(lrand48() % 100000) + 100); //Random sleep min 100us max 100100us
-            clock_gettime(CLOCK_MONOTONIC, &now);
-        }
-        if (result < 0 && errno == ECONNREFUSED) {
-            fprintf(stderr, "Waited 3 seconds for master.  giving up.\n");
-            close(fd);
-            exit(1);
-        }
-        if (result < 0) {
-            fprintf(stderr, "connect %s: %s", addr.sun_path, strerror(errno));
-            exit(1);
-        }
-        return slave(fd, args);
+        return run_slave_cmd(&addr, fd, args);
     } else {
         perror("bind");
         exit(1);