[pull] main from facebook:main

.github/workflows/package.yml

@@ -29,7 +29,7 @@ jobs:
           tags: ${{ format('ghcr.io/{0}/watchman-build-env:latest', github.repository) }}
 
   clone-and-build-and-package-ubuntu:
-    needs: docker
+    needs: docker-ubuntu
     runs-on: ubuntu-latest
     container:
       image: ${{ format('ghcr.io/{0}/watchman-build-env:latest', github.repository) }}

.github/workflows/release.yml

@@ -5,6 +5,10 @@ name: release
   push:
     tags:
       - v*
+
+permissions:
+  contents: write  #  to create a release
+
 jobs:
   prepare:
     runs-on: ubuntu-latest

.github/workflows/release.yml.in

@@ -5,6 +5,10 @@ on:
     tags:
       - v*
 
+permissions:
+  contents: write  #  to create a release
+  packages: write  #  to upload a package
+
 jobs:
   prepare:
     runs-on: ubuntu-latest

.gitignore

@@ -81,8 +81,6 @@ libtool
 ltmain.sh
 cppclient/watchmanclient.pc
 /website/.jekyll-metadata
-/rust/**/Cargo.lock
-/rust/**/target/
 /CMakeCache.txt
 /CMakeFiles
 /*.cmake

CMakeLists.txt

@@ -12,7 +12,17 @@ set(CMAKE_MODULE_PATH
   "${CMAKE_CURRENT_SOURCE_DIR}/build/fbcode_builder/CMake"
   ${CMAKE_MODULE_PATH})
 
-set(CMAKE_CXX_STANDARD 17)
+if(NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  message(STATUS "setting C++ standard to C++${CMAKE_CXX_STANDARD}")
+endif()
+
+# Explicitly enable coroutine support, since GCC does not enable it
+# by default when targeting C++17.
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fcoroutines>)
+endif()
 
 if (WIN32)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWIN32_LEAN_AND_MEAN -DNOMINMAX -DSTRICT")
@@ -395,17 +405,20 @@ endif()
 
 
 if(Python3_Development_FOUND)
-  set(PYOUT "${CMAKE_CURRENT_BINARY_DIR}/build/pytimestamp")
+  set(PYOUT "${CMAKE_CURRENT_BINARY_DIR}/pywatchman")
   set(SETUP_PY "${CMAKE_CURRENT_SOURCE_DIR}/watchman/python/setup.py")
+  set(PYWATCHMAN_BASE ${CMAKE_CURRENT_SOURCE_DIR}/watchman/python)
   file(GLOB PYWATCHMAN_PY_SRCS "watchman/python/pywatchman/*.py")
+  file(MAKE_DIRECTORY ${PYOUT})
   add_custom_command(
     COMMENT "Building pywatchman"
     OUTPUT ${PYOUT}
     DEPENDS ${PYWATCHMAN_PY_SRCS} "watchman/python/pywatchman/bser.c"
+    WORKING_DIRECTORY ${PYWATCHMAN_BASE}
     COMMAND ${CMAKE_COMMAND} -E env
       CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
       CMAKE_CURRENT_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}
-      ${Python3_EXECUTABLE} ${SETUP_PY} build
+      ${Python3_EXECUTABLE} ${SETUP_PY} build --build-base ${PYOUT}
     COMMAND ${CMAKE_COMMAND} -E touch ${PYOUT}
   )
   add_custom_target(pybuild ALL DEPENDS ${PYOUT})
@@ -415,6 +428,7 @@ if(Python3_Development_FOUND)
         CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
         ${Python3_EXECUTABLE} ${SETUP_PY} install
         --root $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}
+      WORKING_DIRECTORY ${PYWATCHMAN_BASE}
       RESULT_VARIABLE STATUS)
     if (NOT STATUS STREQUAL 0)
       message(FATAL_ERROR \"pywatchman install failed\")
@@ -458,8 +472,10 @@ target_link_libraries(third_party_deps INTERFACE
   glog::glog
   gflags
   ${Boost_LIBRARIES}
+  fb303::fb303
   fmt::fmt
   edencommon::edencommon_utils
+  edencommon::edencommon_telemetry
 )
 target_include_directories(third_party_deps INTERFACE
   ${FOLLY_INCLUDE_DIR}
@@ -605,6 +621,7 @@ watchman/PerfSample.cpp
 watchman/fs/ParallelWalk.cpp
 watchman/fs/Pipe.cpp
 watchman/ProcessLock.cpp
+watchman/ProcessUtil.cpp
 # PubSub.cpp  (in liblog)
 watchman/QueryableView.cpp
 watchman/SanityCheck.cpp
@@ -683,6 +700,9 @@ watchman/saved_state/SavedStateInterface.cpp
 watchman/scm/Git.cpp
 watchman/scm/Mercurial.cpp
 watchman/scm/SCM.cpp
+watchman/telemetry/LogEvent.cpp
+watchman/telemetry/WatchmanStats.cpp
+watchman/telemetry/WatchmanStructuredLogger.cpp
 watchman/thirdparty/getopt/GetOpt.cpp
 watchman/watcher/Watcher.cpp
 watchman/watcher/WatcherRegistry.cpp
@@ -744,7 +764,7 @@ function(t_test NAME)
   )
   target_compile_definitions(${NAME}.t
     PUBLIC WATCHMAN_TEST_SRC_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}\")
-  gtest_discover_tests(${NAME}.t)
+  gtest_discover_tests(${NAME}.t DISCOVERY_TIMEOUT 60)
   list(APPEND tests ${NAME}.t)
 endfunction()
 
@@ -756,6 +776,7 @@ add_custom_target(check
 if(Python3_Interpreter_FOUND)
   if (WIN32)
     add_executable(susres watchman/winbuild/susres.cpp)
+    target_link_libraries(susres third_party_deps)
     add_custom_target(make_susres ALL DEPENDS susres)
   endif()
 

CONTRIBUTING.md

@@ -0,0 +1,41 @@
+# Contributing to watchman
+We want to make contributing to this project as easy and transparent as
+possible.
+
+## Our Development Process
+Watchman is currently developed in Meta's internal repositories and then exported out to GitHub by a Meta team member; however, we invite you to submit pull requests as described below.
+
+## Pull Requests
+We actively welcome your pull requests.
+
+1. Fork the repo and create your branch from `main`.
+2. If you've added code that should be tested, add tests.
+3. If you've changed APIs, update the documentation.
+4. Ensure the test suite passes.
+5. Make sure your code lints.
+6. If you haven't already, complete the Contributor License Agreement ("CLA").
+
+## Getting Started
+For more information on how to get started please see [contributing guide](https://facebook.github.io/watchman/docs/contributing).
+
+## Contributor License Agreement ("CLA")
+In order to accept your pull request, we need you to submit a CLA. You only need
+to do this once to work on any of Meta's open source projects.
+
+Complete your CLA here: <https://code.facebook.com/cla>
+
+## Issues
+We use GitHub issues to track public bugs. Please ensure your description is
+clear and has sufficient instructions to be able to reproduce the issue.
+
+Meta has a [bounty program](https://www.facebook.com/whitehat/) for the safe
+disclosure of security bugs. In those cases, please go through the process
+outlined on that page and do not file a public issue.
+
+## Coding Style
+* 2 spaces for indentation rather than tabs
+* 80 character line length
+
+## License
+By contributing to watchman, you agree that your contributions will be licensed
+under the LICENSE file in the root directory of this source tree (MIT License).

README.markdown

@@ -38,4 +38,4 @@ Please submit a [GitHub issue](https://github.com/facebook/watchman/issues/) to
 
 ## Contributing
 
-Please see the [contributing guide](https://facebook.github.io/watchman/contributing.html).
+Please see the [contributing document](CONTRIBUTING.md).

build/deps/github_hashes/facebook/fbthrift-rev.txt

@@ -1 +1 @@
-Subproject commit f06abe38cf79a4a3233b511f41c13f2d676f4bea
+Subproject commit 84d64ccee636375fcce063b0bf07e19188dfb808

build/deps/github_hashes/facebook/folly-rev.txt

@@ -1 +1 @@
-Subproject commit f62dca2944bb17b50f684a0fd74fedba619ceabc
+Subproject commit 95c9b2b57fa47f316a4c6d7b89c12e93346df04e

build/deps/github_hashes/facebook/wangle-rev.txt

@@ -1 +1 @@
-Subproject commit 1329a887b6fce52c55d7b67f0a25022c5726b14f
+Subproject commit 77ab2ac5f6fd36da304d96b76de5cd28359e3035

build/fbcode_builder/CMake/FindGlog.cmake

@@ -38,6 +38,12 @@ if (NOT TARGET glog::glog)
   find_package(Gflags)
   if(GFLAGS_FOUND)
     message(STATUS "Found gflags as a dependency of glog::glog, include=${LIBGFLAGS_INCLUDE_DIR}, libs=${LIBGFLAGS_LIBRARY}")
-    set_target_properties(glog::glog PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES ${LIBGFLAGS_LIBRARY})
+    set_property(TARGET glog::glog APPEND PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES ${LIBGFLAGS_LIBRARY})
+  endif()
+
+  find_package(LibUnwind)
+  if(LIBUNWIND_FOUND)
+    message(STATUS "Found LibUnwind as a dependency of glog::glog, include=${LIBUNWIND_INCLUDE_DIR}, libs=${LIBUNWIND_LIBRARY}")
+    set_property(TARGET glog::glog APPEND PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES ${LIBUNWIND_LIBRARY})
   endif()
 endif()

build/fbcode_builder/CMake/FindLMDB.cmake

@@ -0,0 +1,19 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2.
+
+find_library(LMDB_LIBRARIES NAMES lmdb liblmdb)
+mark_as_advanced(LMDB_LIBRARIES)
+
+find_path(LMDB_INCLUDE_DIR NAMES  lmdb.h)
+mark_as_advanced(LMDB_INCLUDE_DIR)
+
+find_package_handle_standard_args(
+     LMDB
+     REQUIRED_VARS LMDB_LIBRARIES LMDB_INCLUDE_DIR)
+
+if(LMDB_FOUND)
+  set(LMDB_LIBRARIES ${LMDB_LIBRARIES})
+  set(LMDB_INCLUDE_DIR, ${LMDB_INCLUDE_DIR})
+endif()

build/fbcode_builder/CMake/FindXxhash.cmake

@@ -0,0 +1,40 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# - Try to find Facebook xxhash library
+# This will define
+# Xxhash_FOUND
+# Xxhash_INCLUDE_DIR
+# Xxhash_LIBRARY
+#
+
+find_path(Xxhash_INCLUDE_DIR NAMES xxhash.h)
+
+find_library(Xxhash_LIBRARY_RELEASE NAMES xxhash)
+
+include(SelectLibraryConfigurations)
+SELECT_LIBRARY_CONFIGURATIONS(Xxhash)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+    Xxhash DEFAULT_MSG
+    Xxhash_LIBRARY Xxhash_INCLUDE_DIR
+)
+
+if (Xxhash_FOUND)
+  message(STATUS "Found xxhash: ${Xxhash_LIBRARY}")
+endif()
+
+mark_as_advanced(Xxhash_INCLUDE_DIR Xxhash_LIBRARY)