For old thread_usleep API

alibaba · Sep 10, 2024 · bdf2350 · bdf2350
1 parent 5b063be
commit bdf2350
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/io/epoll.cpp b/io/epoll.cpp
@@ -271,7 +271,7 @@ class EventEngineEPoll : public MasterEventEngine, public CascadingEventEngine {
         if (ret < 0) LOG_ERROR_RETURN(0, -1, "failed to add event interest");
         // if timeout is just simple 0, wait for a tiny little moment
         // so that events can be collect.
-        ret = thread_usleep(timeout.timeout() ? timeout : Timeout(10));
+        ret = thread_usleep(timeout ? timeout : 10);
         ERRNO err;
         if (ret == -1 && err.no == EOK) {
             return 0;  // Event arrived

diff --git a/io/kqueue.cpp b/io/kqueue.cpp
@@ -80,7 +80,7 @@ class KQueue : public MasterEventEngine, public CascadingEventEngine {
     int wait_for_fd(int fd, uint32_t interests, uint64_t timeout) override {
         short ev = (interests == EVENT_READ) ? EVFILT_READ : EVFILT_WRITE;
         enqueue(fd, ev, EV_ADD | EV_ONESHOT, 0, CURRENT);
-        int ret = thread_usleep(timeout.timeout() ? timeout : Timeout(10));
+        int ret = thread_usleep(timeout ? timeout : 10);
         ERRNO err;
         if (ret == -1 && err.no == EOK) {
             return 0;  // event arrived

diff --git a/net/pooled_socket.cpp b/net/pooled_socket.cpp
@@ -230,7 +230,6 @@ class TCPSocketPool : public ForwardSocketClient {
 
     bool release(EndPoint ep, ISocketStream* stream) {
         auto fd = stream->get_underlay_fd();
-        ERRNO err;
         if (!stream_reusable(fd)) return false;
         auto node = new StreamListNode(ep, stream, fd, expiration);
         push_into_pool(node);