X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.cpp;h=8dde44940fdeee6e03777e50766e803c05c14474;hb=8c712205657ceceb8644065735b5fff06bedfbb5;hp=3c8bc0a0815a2cfd9315a39271380b54abc34a53;hpb=22cf0bf96f4a94f5fbfec6f5dfc3adeb5b66e7ac;p=staging%2Fwindowmanager.git

diff --git a/src/main.cpp b/src/main.cpp
index 3c8bc0a..8dde449 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,73 +3,74 @@
 
 #include <unistd.h>
 
+#include <signal.h>
 #include <sys/poll.h>
+#include <sys/signalfd.h>
+
+#include <algorithm>
 
 struct connection {
    std::vector<std::unique_ptr<wl::output>> outputs;
    std::unique_ptr<genivi::controller> c;
 };
 
-namespace {
-//       _               _                            _        ____
-//   ___| |__   ___  ___| | __    _____   _____ _ __ | |_ ___ / /\ \
-//  / __| '_ \ / _ \/ __| |/ /   / _ \ \ / / _ \ '_ \| __/ __| |  | |
-// | (__| | | |  __/ (__|   <   |  __/\ V /  __/ | | | |_\__ \ |  | |
-//  \___|_| |_|\___|\___|_|\_\___\___| \_/ \___|_| |_|\__|___/ |  | |
-//                          |_____|                           \_\/_/
-int check_events(struct wl::display &d, struct connection &c, int fd) {
-   struct pollfd pfd[2] = {{.fd = d.get_fd(), .events = POLLIN, .revents = 0},
-                           {.fd = fd, .events = POLLIN, .revents = 0}};
-
-   d.flush();
-
-   if (poll(pfd, fd != -1 ? 2 : 1, -1) != -1 && errno != EINTR) {
-      int ret = 0;
-
-      if ((pfd[0].revents & POLLIN) != 0) {
-         ret = d.dispatch();
-      }
-
-      if (ret == -1) {
-         return ret;
-      }
-
-      if (fd != -1 && ((pfd[1].revents & POLLIN) != 0)) {
-         char buf[256];
-
-         // read all there is ...
-         while (read(pfd[1].fd, buf, sizeof(buf)) == sizeof(buf)) {
-            ;
-         }
+//      _                   _     ____       _ _
+//  ___| |_ _ __ _   _  ___| |_  |  _ \ ___ | | | ___ _ __
+// / __| __| '__| | | |/ __| __| | |_) / _ \| | |/ _ \ '__|
+// \__ \ |_| |  | |_| | (__| |_  |  __/ (_) | | |  __/ |
+// |___/\__|_|   \__,_|\___|\__| |_|   \___/|_|_|\___|_|
+//
+struct Poller {
+   std::vector<std::function<int(int)>> handlers;
+   std::vector<struct pollfd> pfds;
+
+   Poller() = default;
+   void add_fd(int fd, std::function<int(int)> handler);
+   int check_events();
+};
 
-         // Display current status
-         if (!c.c->surfaces.empty()) {
-            puts("Surfaces:");
-            for (auto const &i : c.c->surfaces) {
-               auto const &r = i.second->dst_rect;
-               auto const &s = i.second->size;
-               printf("%d [%ux%u] (%ux%u@%dx%d), ", i.first, s.w, s.h, r.w, r.h,
-                      r.x, r.y);
-            }
-            puts("\b\b ");
-         }
+void Poller::add_fd(int fd, std::function<int(int)> handler) {
+   pfds.emplace_back(pollfd{.fd = fd, .events = POLLIN, .revents = 0});
+   handlers.emplace_back(std::move(handler));
+}
 
-         if (!c.c->layers.empty()) {
-            puts("Layers:");
-            for (auto const &i : c.c->layers) {
-               auto const &r = i.second->dst_rect;
-               auto const &s = i.second->size;
-               printf("%d [%ux%u] (%ux%u@%dx%d), ", i.first, s.w, s.h, r.w, r.h,
-                      r.x, r.y);
+int Poller::check_events() {
+   int ret = 0;
+   if ((ret = poll(this->pfds.data(), this->pfds.size(), -1)) != -1 &&
+       errno != EINTR) {
+      for (unsigned i = 0; i < pfds.size(); i++) {
+         if (pfds[i].revents & POLLIN) {
+            if (handlers[i](pfds[i].fd) == -1) {
+               return -1;
             }
-            puts("\b\b ");
+            pfds[i].revents = 0;
+            pfds[i].events = POLLIN;
          }
       }
    }
-
-   return 0;
+   return ret;
 }
 
+struct unique_fd {
+   int fd {-1};
+   unique_fd() = default;
+   explicit unique_fd(int f) : fd{f} {}
+   operator int() const { return fd; }
+   ~unique_fd() {
+      if (this->fd != -1)
+         close(this->fd);
+   }
+   unique_fd(unique_fd const &) = delete;
+   unique_fd &operator=(unique_fd const &) = delete;
+   unique_fd(unique_fd &&o) : fd(o.fd) { o.fd = -1; }
+   unique_fd &operator=(unique_fd &&o) {
+      std::swap(this->fd, o.fd);
+      return *this;
+   }
+};
+
+
+namespace {
 //  _       _ _       _                         _    ____
 // (_)_ __ (_) |_    | | __ _ _   _  ___  _   _| |_ / /\ \
 // | | '_ \| | __|   | |/ _` | | | |/ _ \| | | | __| |  | |
@@ -168,10 +169,42 @@ int main(int /*argc*/, char ** /*argv*/) {
       fatal("Could not init layout: %s", e);
    }
 
-   while (check_events(d, c, STDIN_FILENO) != -1) {
+   struct Poller p{};
+   p.add_fd(STDIN_FILENO, [&c](int fd) {
+       int buf;
+       ssize_t ret;
+       while ((ret = read(fd, &buf, sizeof(buf))) == sizeof(buf)) {
+          ;
+       }
+       c.c->debug_dump_current_status();
+       return ret == 0 ? -1 : 0;
+   });
+
+   p.add_fd(d.get_fd(), [&d](int fd) {
+      return d.dispatch();
+   });
+
+   sigset_t sset{};
+   sigemptyset(&sset);
+   sigaddset(&sset, SIGINT);
+   sigaddset(&sset, SIGTERM);
+
+   auto sfd = unique_fd(signalfd(-1, &sset, SFD_NONBLOCK | SFD_CLOEXEC));
+   sigprocmask(SIG_BLOCK, &sset, NULL);
+   p.add_fd(sfd.fd, [](int fd) {
+      struct signalfd_siginfo si;
+      while (read(fd, &si, sizeof(si)) == sizeof(si)) {
+          lognotice("Received signal %u", si.ssi_signo);
+      }
+      return -1;
+   });
+
+   while ((d.flush(), p.check_events()) != -1) {
       c.c->execute_pending();
-      d.flush();
    }
 
+   c.c->commit_changes();
+   d.roundtrip();
+
    return 0;
 }