From patchwork Thu Apr 20 17:56:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 97863 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp914750qgf; Thu, 20 Apr 2017 10:57:01 -0700 (PDT) X-Received: by 10.84.232.133 with SMTP id i5mr3590204plk.172.1492711021861; Thu, 20 Apr 2017 10:57:01 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id k70si7140638pfa.245.2017.04.20.10.57.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Apr 2017 10:57:01 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-78812-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of libc-alpha-return-78812-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-78812-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=UahldU7Oaw7HJNx0bmLffOJPkSqMUVX eDw20uRp2wJQLhJ+QSUbb195m8TXNf1rwrnfaIxhiS9MQqZIqNy/85ui+utqfLM8 +Y4p7MxFVFmdhF5BA4jhvqOYKrL/AjzPv6ALy8is2ofuh5IlNuvprZsewHsnbBxN Xg341M9eksO0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=Mcm2adD5OhkK6zTeIEQusBFk0rg=; b=WXAkd 3ehWKu9RgALi8+apLfHNdQyp6Is1ucU8NuWipmyCqoVlVEzFiA8UU3QSBbzbngzb O/WkEmQTVwfzXVlBLcYk9IfpGaZAdQ7kO1+5nKO77RHTiNA0Rinoj7qTLDKuqtmU KgeivawSZecdTCGYCG0FMNORcnZj3z7eI+d4Ls= Received: (qmail 105445 invoked by alias); 20 Apr 2017 17:56:21 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 105341 invoked by uid 89); 20 Apr 2017 17:56:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=H*RU:209.85.220.176, Hx-spam-relays-external:209.85.220.176, UD:mk X-HELO: mail-qk0-f176.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=G+0722MhpprBod+0twEkAKoW6J7vwZKMvjSb0Nng6dc=; b=iDCeWUJ7PsGw1KWxfbjFWOvT3llYh3w4KTLow9RXzHjNO800f4wGFCqK1xg/kmQfZ9 ug5VS/f+NqCNXcg0Ce+uhZQndaIUW8g9hK6fftIcbJ9NwodI3BHM2qbuafU0N05Ysr30 U+mxUOn7BjiyUQ3iToFOQZtpGsst/8IfgTOxhPEz9x8mB4MqbzdEr2JvEDGa2ygoE0JE O1v8v4CAGuFQXP5Z3WUWVO1nGLhveV/KNJfSJqI6rLU9goSyr5tuhqO86NIAkXCFVLNa 7REKRbRlpRixdfLEe+nfDaQuVKDaj2CmjUrAG3UXRLP1Vlc4fWSEaH2NxJAbYgfftiIu OXXg== X-Gm-Message-State: AN3rC/5g2cg9xQm5Ni/T9m/riseu71CIJV9yRvxQ0lTfcrSx8CWBr946 5zUiDZnXhT37Q7KNKVs1Og== X-Received: by 10.55.4.149 with SMTP id 143mr9558805qke.288.1492710978061; Thu, 20 Apr 2017 10:56:18 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 3/3] Consolidate Linux epoll_wait syscall Date: Thu, 20 Apr 2017 14:56:08 -0300 Message-Id: <1492710968-7699-3-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1492710968-7699-1-git-send-email-adhemerval.zanella@linaro.org> References: <1492710968-7699-1-git-send-email-adhemerval.zanella@linaro.org> This patch consolidates the epoll_wait Linux syscall generation on sysdeps/unix/sysv/linux/epoll_wait.c. The implementation tries to use __NR_epoll_wait if defined, otherwise calls epoll_pwait. Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32, arch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu. * sysdeps/unix/sysv/linux/epoll_wait.c: New file. * sysdeps/unix/sysv/linux/generic/epoll_wait.c: Remove file. * sysdeps/unix/sysv/linux/syscalls.list: Remove epoll_wait from auto-generation list. --- ChangeLog | 9 +++++++++ sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/{generic => }/epoll_wait.c | 8 ++++++-- sysdeps/unix/sysv/linux/generic/Makefile | 2 +- sysdeps/unix/sysv/linux/syscalls.list | 1 - 5 files changed, 17 insertions(+), 5 deletions(-) rename sysdeps/unix/sysv/linux/{generic => }/epoll_wait.c (82%) -- 2.7.4 diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 1872cdb..a8790b1 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -17,7 +17,7 @@ include $(firstword $(wildcard $(sysdirs:=/sysctl.mk))) sysdep_routines += clone umount umount2 readahead \ setfsuid setfsgid epoll_pwait signalfd \ eventfd eventfd_read eventfd_write prlimit \ - personality + personality epoll_wait CFLAGS-gethostid.c = -fexceptions CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))" diff --git a/sysdeps/unix/sysv/linux/generic/epoll_wait.c b/sysdeps/unix/sysv/linux/epoll_wait.c similarity index 82% rename from sysdeps/unix/sysv/linux/generic/epoll_wait.c rename to sysdeps/unix/sysv/linux/epoll_wait.c index d9363f1..eb6e6d3 100644 --- a/sysdeps/unix/sysv/linux/generic/epoll_wait.c +++ b/sysdeps/unix/sysv/linux/epoll_wait.c @@ -1,6 +1,6 @@ -/* Copyright (C) 2011-2017 Free Software Foundation, Inc. +/* Linux epoll_wait syscall implementation. + Copyright (C) 2017 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Chris Metcalf , 2011. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -24,5 +24,9 @@ int epoll_wait (int epfd, struct epoll_event *events, int maxevents, int timeout) { +#ifdef __NR_epoll_wait + return SYSCALL_CANCEL (epoll_wait, epfd, events, maxevents, timeout); +#else return epoll_pwait (epfd, events, maxevents, timeout, NULL); +#endif } diff --git a/sysdeps/unix/sysv/linux/generic/Makefile b/sysdeps/unix/sysv/linux/generic/Makefile index c1daee2..7e27e79 100644 --- a/sysdeps/unix/sysv/linux/generic/Makefile +++ b/sysdeps/unix/sysv/linux/generic/Makefile @@ -1,3 +1,3 @@ ifeq ($(subdir),misc) -sysdep_routines += epoll_create epoll_wait inotify_init +sysdep_routines += epoll_create inotify_init endif diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 4d550b8..1a10903 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -12,7 +12,6 @@ delete_module EXTRA delete_module 3 delete_module epoll_create EXTRA epoll_create i:i epoll_create epoll_create1 EXTRA epoll_create1 i:i epoll_create1 epoll_ctl EXTRA epoll_ctl i:iiip epoll_ctl -epoll_wait EXTRA epoll_wait Ci:ipii epoll_wait eventfd EXTRA eventfd2 i:ii eventfd execve - execve i:spp __execve execve fdatasync - fdatasync Ci:i fdatasync