feat: nearly complete POSIX.1-2008 compliant terminal interface implementation

[lunaix-os.git] / lunaix-os / kernel / device / poll.c

diff --git a/lunaix-os/kernel/device/poll.c b/lunaix-os/kernel/device/poll.c
index e7f0f876a909ee602b17ce32d51b2067030f7bd2..bf7edd7c645eb760263c8947bd3992fdfa8feda7 100644 (file)
--- a/lunaix-os/kernel/device/poll.c
+++ b/lunaix-os/kernel/device/poll.c
@@ -149,7 +149,7 @@ __append_pollers(int* ds, int npoller)
     return nc;
 }
 
     return nc;
 }
 

-static int
+static void

 __wait_until_event()
 {
     block_current();
 __wait_until_event()
 {
     block_current();


@@ -159,7 +159,7 @@ __wait_until_event()
 void
 iopoll_init(struct iopoll* ctx)
 {
 void
 iopoll_init(struct iopoll* ctx)
 {

-    ctx->pollers = valloc(sizeof(ptr_t) * MAX_POLLER_COUNT);
+    ctx->pollers = vzalloc(sizeof(ptr_t) * MAX_POLLER_COUNT);

     ctx->n_poller = 0;
 }
 
     ctx->n_poller = 0;
 }
 


@@ -173,9 +173,9 @@ iopoll_free(pid_t pid, struct iopoll* ctx)
             llist_delete(&poller->evt_listener);
             vfree(poller);
         }
             llist_delete(&poller->evt_listener);
             vfree(poller);
         }

-
-        vfree(ctx->pollers);

     }
     }

+    
+    vfree(ctx->pollers);

 }
 
 void
 }
 
 void


@@ -257,7 +257,7 @@ __DEFINE_LXSYSCALL2(int, pollctl, int, action, va_list, va)
 
             time_t t1 = clock_systime() + timeout;
             while (!(retcode == __do_poll_round(pinfos, npinfos))) {
 
             time_t t1 = clock_systime() + timeout;
             while (!(retcode == __do_poll_round(pinfos, npinfos))) {

-                if (timeout >= 0 && t1 >= clock_systime()) {
+                if (timeout >= 0 && t1 < clock_systime()) {

                     break;
                 }
                 __wait_until_event();
                     break;
                 }
                 __wait_until_event();


@@ -269,7 +269,7 @@ __DEFINE_LXSYSCALL2(int, pollctl, int, action, va_list, va)
 
             time_t t1 = clock_systime() + timeout;
             while (!(retcode == __do_poll_all(pinfo))) {
 
             time_t t1 = clock_systime() + timeout;
             while (!(retcode == __do_poll_all(pinfo))) {

-                if (timeout >= 0 && t1 >= clock_systime()) {
+                if (timeout >= 0 && t1 < clock_systime()) {

                     break;
                 }
                 __wait_until_event();
                     break;
                 }
                 __wait_until_event();