From patchwork Wed Sep 30 15:50:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gurucharan Shetty X-Patchwork-Id: 524462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id A3FB2140D26 for ; Thu, 1 Oct 2015 01:53:19 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id B571710A3C; Wed, 30 Sep 2015 08:53:17 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v1.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 42A5910A3A for ; Wed, 30 Sep 2015 08:53:17 -0700 (PDT) Received: from bar3.cudamail.com (bar1 [192.168.15.1]) by mx3v1.cudamail.com (Postfix) with ESMTP id A794A618BC9 for ; Wed, 30 Sep 2015 09:53:14 -0600 (MDT) X-ASG-Debug-ID: 1443628383-03dd7b3c45190d0001-byXFYA Received: from mx3-pf1.cudamail.com ([192.168.14.2]) by bar3.cudamail.com with ESMTP id W2kbPp8T7asC01Ct (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 30 Sep 2015 09:53:03 -0600 (MDT) X-Barracuda-Envelope-From: shettyg@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.2 Received: from unknown (HELO mail-pa0-f50.google.com) (209.85.220.50) by mx3-pf1.cudamail.com with ESMTPS (RC4-SHA encrypted); 30 Sep 2015 15:53:03 -0000 Received-SPF: unknown (mx3-pf1.cudamail.com: Multiple SPF records returned) X-Barracuda-Apparent-Source-IP: 209.85.220.50 X-Barracuda-RBL-IP: 209.85.220.50 Received: by pacex6 with SMTP id ex6so44458920pac.0 for ; Wed, 30 Sep 2015 08:53:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-type:content-transfer-encoding; bh=4tHJ3kj32qJVcokdDZlRi+KpmKPTK5Rz+hnczNHDGmo=; b=eTTKZHo9/kP2hkFgYaY23BQApG7YiWxr89XiCK5/m8oT62k8FN5xGM0ZVAG5I5fQSE GW0ozC3msJjpoNNoeJ64upMw1JDtpcRsEROyNcrEaxkjKb7HWNybRWtT87UeeLewGMqF 8C4hMKAvmFsPgTe0ZkpWgTKSshxCQVCmVetMfNScmRXMFon8hDfTwrsUEDzT4FRL6Pn4 bci7lUnNMVYTZdydfrLcqQazsksN1OSa0JT2zRbOjLMw+o+HAjZyu4gzWYOkyI8X2itZ mvzsINNM1JmB78xOqxOadnKD/kxqpLnAbKEUH30k6s/jef1TOjwYCEwedPjtrJvy7+ui V4VA== X-Gm-Message-State: ALoCoQnpw415dZA+e/fP5SYQh3i+y5Uuae9/IhRl9OwPTvgqiJBMDOQmmSsc5mC1gBxLHB6fbx/m X-Received: by 10.68.190.5 with SMTP id gm5mr5747862pbc.25.1443628383184; Wed, 30 Sep 2015 08:53:03 -0700 (PDT) Received: from ubuntu-test.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id qn5sm1390199pac.41.2015.09.30.08.53.02 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Sep 2015 08:53:02 -0700 (PDT) X-CudaMail-Envelope-Sender: shettyg@nicira.com From: Gurucharan Shetty X-Google-Original-From: Gurucharan Shetty To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V1-929034351 X-CudaMail-DTE: 093015 X-CudaMail-Originating-IP: 209.85.220.50 Date: Wed, 30 Sep 2015 08:50:02 -0700 X-ASG-Orig-Subj: [##CM-V1-929034351##]=?UTF-8?q?=5BPATCH=5D=20Revert=20=22poll-loop=3A=20Fix=20assertion=20in=20poll=5Fcreate=5Fnode=28=29=2E=22?= Message-Id: <1443628202-3286-1-git-send-email-gshetty@nicira.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-Barracuda-Connect: UNKNOWN[192.168.14.2] X-Barracuda-Start-Time: 1443628383 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: Gurucharan Shetty Subject: [ovs-dev] =?utf-8?q?=5BPATCH=5D_Revert_=22poll-loop=3A_Fix_assert?= =?utf-8?b?aW9uIGluIHBvbGxfY3JlYXRlX25vZGUoKS4i?= X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@openvswitch.org Sender: "dev" This reverts commit ae09fae8a6b43299a628ae0989fe2fedb924d560. Commit ae09fae8a6b432 caused segfaults while running unit tests on Windows as pollfd.fd on Windows does not take negative values. Signed-off-by: Gurucharan Shetty --- This patch has already been applied and is just a FYI. --- AUTHORS | 2 -- lib/poll-loop.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index cba0535..6e5bbab 100644 --- a/AUTHORS +++ b/AUTHORS @@ -80,7 +80,6 @@ Hao Zheng hzheng@nicira.com Helmut Schaa helmut.schaa@googlemail.com Huanle Han hanxueluo@gmail.com Ian Campbell Ian.Campbell@citrix.com -Ilya Maximets i.maximets@samsung.com Isaku Yamahata yamahata@valinux.co.jp James P. roampune@gmail.com James Page james.page@ubuntu.com @@ -328,7 +327,6 @@ Mikael Doverhag mdoverhag@nicira.com Mrinmoy Das mrdas@ixiacom.com Nagi Reddy Jonnala njonnala@Brocade.com Niels van Adrichem N.L.M.vanAdrichem@tudelft.nl -Nikita Kalyazin n.kalyazin@samsung.com Niklas Andersson nandersson@nicira.com Pankaj Thakkar thakkar@nicira.com Pasi Kärkkäinen pasik@iki.fi diff --git a/lib/poll-loop.c b/lib/poll-loop.c index 36eb5ac..3c4b55c 100644 --- a/lib/poll-loop.c +++ b/lib/poll-loop.c @@ -104,7 +104,7 @@ poll_create_node(int fd, HANDLE wevent, short int events, const char *where) COVERAGE_INC(poll_create_node); /* Both 'fd' and 'wevent' cannot be set. */ - ovs_assert(fd == -1 || !wevent); + ovs_assert(!fd != !wevent); /* Check for duplicate. If found, "or" the events. */ node = find_poll_node(loop, fd, wevent); @@ -159,7 +159,7 @@ poll_fd_wait_at(int fd, short int events, const char *where) void poll_wevent_wait_at(HANDLE wevent, const char *where) { - poll_create_node(-1, wevent, 0, where); + poll_create_node(0, wevent, 0, where); } #endif /* _WIN32 */