Index: clang-tidy/android/AndroidTidyModule.cpp =================================================================== --- clang-tidy/android/AndroidTidyModule.cpp +++ clang-tidy/android/AndroidTidyModule.cpp @@ -11,6 +11,7 @@ #include "../ClangTidyModule.h" #include "../ClangTidyModuleRegistry.h" #include "CloexecCreatCheck.h" +#include "CloexecEpollCreateCheck.h" #include "CloexecFopenCheck.h" #include "CloexecOpenCheck.h" #include "CloexecSocketCheck.h" @@ -26,6 +27,8 @@ public: void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override { CheckFactories.registerCheck("android-cloexec-creat"); + CheckFactories.registerCheck( + "android-cloexec-epoll-create"); CheckFactories.registerCheck("android-cloexec-fopen"); CheckFactories.registerCheck("android-cloexec-open"); CheckFactories.registerCheck("android-cloexec-socket"); Index: clang-tidy/android/CMakeLists.txt =================================================================== --- clang-tidy/android/CMakeLists.txt +++ clang-tidy/android/CMakeLists.txt @@ -3,6 +3,7 @@ add_clang_library(clangTidyAndroidModule AndroidTidyModule.cpp CloexecCreatCheck.cpp + CloexecEpollCreateCheck.cpp CloexecFopenCheck.cpp CloexecOpenCheck.cpp CloexecSocketCheck.cpp Index: clang-tidy/android/CloexecEpollCreateCheck.h =================================================================== --- /dev/null +++ clang-tidy/android/CloexecEpollCreateCheck.h @@ -0,0 +1,35 @@ +//===--- CloexecEpollCreateCheck.h - clang-tidy------------------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_EPOLL_CREATE_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_EPOLL_CREATE_H + +#include "../ClangTidy.h" + +namespace clang { +namespace tidy { +namespace android { + +/// epoll_create() is better to be replaced by epoll_create1(). +/// +/// For the user-facing documentation see: +/// http://clang.llvm.org/extra/clang-tidy/checks/android-cloexec-epoll-create.html +class CloexecEpollCreateCheck : public ClangTidyCheck { +public: + CloexecEpollCreateCheck(StringRef Name, ClangTidyContext *Context) + : ClangTidyCheck(Name, Context) {} + void registerMatchers(ast_matchers::MatchFinder *Finder) override; + void check(const ast_matchers::MatchFinder::MatchResult &Result) override; +}; + +} // namespace android +} // namespace tidy +} // namespace clang + +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_ANDROID_CLOEXEC_EPOLL_CREATE_H Index: clang-tidy/android/CloexecEpollCreateCheck.cpp =================================================================== --- /dev/null +++ clang-tidy/android/CloexecEpollCreateCheck.cpp @@ -0,0 +1,42 @@ +//===--- CloexecEpollCreateCheck.cpp - clang-tidy--------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include "CloexecEpollCreateCheck.h" +#include "clang/AST/ASTContext.h" +#include "clang/ASTMatchers/ASTMatchFinder.h" + +using namespace clang::ast_matchers; + +namespace clang { +namespace tidy { +namespace android { + +void CloexecEpollCreateCheck::registerMatchers(MatchFinder *Finder) { + Finder->addMatcher( + callExpr(callee(functionDecl(isExternC(), returns(isInteger()), + hasName("epoll_create"), + hasParameter(0, hasType(isInteger()))) + .bind("funcDecl"))) + .bind("epollCreateFn"), + this); +} + +void CloexecEpollCreateCheck::check(const MatchFinder::MatchResult &Result) { + const auto *MatchedCall = Result.Nodes.getNodeAs("epollCreateFn"); + + diag(MatchedCall->getLocStart(), "prefer epoll_create() to epoll_create1() " + "because epoll_create1() allows " + "EPOLL_CLOEXEC") + << FixItHint::CreateReplacement(MatchedCall->getSourceRange(), + "epoll_create1(EPOLL_CLOEXEC)"); +} + +} // namespace android +} // namespace tidy +} // namespace clang Index: docs/ReleaseNotes.rst =================================================================== --- docs/ReleaseNotes.rst +++ docs/ReleaseNotes.rst @@ -57,6 +57,11 @@ Improvements to clang-tidy -------------------------- +- New `android-cloexec-epoll-create + `_ check + + Detects usage of ``epoll_create()``. + - New `android-cloexec-creat `_ check Index: docs/clang-tidy/checks/android-cloexec-epoll-create.rst =================================================================== --- /dev/null +++ docs/clang-tidy/checks/android-cloexec-epoll-create.rst @@ -0,0 +1,17 @@ +.. title:: clang-tidy - android-cloexec-epoll-create + +android-cloexec-epoll-create +============================ + +The usage of ``epoll_create()`` is not recommended, it's better to use +``epoll_create1()``, which allows close-on-exec. + +Examples: + +.. code-block:: c++ + + epoll_create(size); + + // becomes + + epoll_create1(EPOLL_CLOEXEC); Index: docs/clang-tidy/checks/list.rst =================================================================== --- docs/clang-tidy/checks/list.rst +++ docs/clang-tidy/checks/list.rst @@ -5,6 +5,7 @@ .. toctree:: android-cloexec-creat + android-cloexec-epoll-create android-cloexec-fopen android-cloexec-open android-cloexec-socket Index: test/clang-tidy/android-cloexec-epoll-create.cpp =================================================================== --- /dev/null +++ test/clang-tidy/android-cloexec-epoll-create.cpp @@ -0,0 +1,24 @@ +// RUN: %check_clang_tidy %s android-cloexec-epoll-create %t + +extern "C" int epoll_create(int size); + +void f() { + epoll_create(0); + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: prefer epoll_create() to epoll_create1() because epoll_create1() allows EPOLL_CLOEXEC [android-cloexec-epoll-create] + // CHECK-FIXES: epoll_create1(EPOLL_CLOEXEC) +} + +namespace i { +int epoll_create(int size); +void g() { + epoll_create(0); +} +} // namespace i + +class C { +public: + int epoll_create(int size); + void h() { + epoll_create(0); + } +};