Merge pull request #59 from StarryInternet/folly-upgrade

Upgrade Folly to v2020.12.07.00

Author: Matt Pelland

decibel-cpp/include/decibel/messaging/Reactor.h

@@ -1,4 +1,4 @@
-
+// Copyright 2017, 2020. Starry, Inc. All Rights Reserved.
 #pragma once
 
 #include <unordered_set>
@@ -75,7 +75,8 @@ class Reactor : public folly::Timekeeper
     // virtual void add(folly::Func fn);
 
     // folly::TimeKeeper
-    virtual folly::SemiFuture<folly::Unit> after(folly::Duration duration);
+    virtual folly::SemiFuture<folly::Unit>
+    after(folly::HighResDuration duration);
 
     niceuv::ITimer* GetTimer();
 

decibel-cpp/src/decibel/messaging/Reactor.cpp

@@ -1,3 +1,4 @@
+// Copyright 2017, 2020. Starry, Inc. All Rights Reserved.
 #include "decibel/messaging/Reactor.h"
 
 #include "decibel/messaging/Exchanges.h"
@@ -162,7 +163,7 @@ void Reactor::CancelCall(std::shared_ptr<OneShotTimerEvent> pTimer)
 //     CallSoon(fn);
 // }
 
-folly::SemiFuture<folly::Unit> Reactor::after(folly::Duration duration)
+folly::SemiFuture<folly::Unit> Reactor::after(folly::HighResDuration duration)
 {
     auto pPromise = std::make_shared<folly::Promise<folly::Unit>>();
     CallLater(duration.count(), [pPromise] { pPromise->setValue(); });
@@ -176,7 +177,9 @@ void Reactor::Shutdown()
     {
         futures.push_back(client->Shutdown());
     }
-    folly::collectAll(futures).thenValue([this](auto /*unused*/) { this->Stop(); });
+    folly::collectAll(futures)
+        .toUnsafeFuture()
+        .thenValue([this](auto /*unused*/) { this->Stop(); });
     Start();
 }
 

decibel-cpp/src/decibel/niceuv/FutureSubprocess.cpp

@@ -1,4 +1,4 @@
-
+// Copyright 2017, 2020. Starry, Inc. All Rights Reserved.
 #include <algorithm>
 
 #include <log4cxx/logger.h>
@@ -64,6 +64,7 @@ folly::Future<SubprocessHandler::Buffer> FutureSubprocess::RunSubprocess()
     folly::collectAll(pStdOutPromise->getFuture(),
                       pExitPromise->getFuture(),
                       pStdErrPromise->getFuture())
+        .toUnsafeFuture()
         .thenValue([pWrappedPromise](
             const std::tuple<folly::Try<SubprocessHandler::Buffer>,
                              folly::Try<int>,

docker_builds/Dockerfile

@@ -7,7 +7,6 @@ COPY install-protobuf.sh /var/tmp
 RUN /var/tmp/install-protobuf.sh
 
 COPY install-folly.sh /var/tmp
-COPY patches/folly /var/tmp/patches/folly
 RUN /var/tmp/install-folly.sh
 
 COPY install-ampq-cpp.sh /var/tmp

docker_builds/install-folly.sh

@@ -1,20 +1,21 @@
 #!/usr/bin/env bash
-# Copyright 2019. Starry, Inc. All Rights Reserved.
+# Copyright 2019, 2020. Starry, Inc. All Rights Reserved.
 set -ex
 
 CPU_COUNT=$(nproc)
 
 WORKDIR=${1-/var/tmp/third_party_build/tmp}
 INSTALL_PREFIX=${2-/usr/local}
 SCRIPTDIR="$(cd "$(dirname "$0")" && pwd -P)"
+PATCHESDIR="${SCRIPTDIR}/patches/folly"
 mkdir -p "${WORKDIR}"
 
 if [ -z "${FORCE_REINSTALL}" ]; then
     FORCE_REINSTALL=0
 fi
 
 # folly
-FOLLY_VERSION="v2019.12.09.00"
+FOLLY_VERSION="v2020.12.07.00"
 
 # shellcheck disable=SC2166
 if [ "${FORCE_REINSTALL}" -eq 1 ] || \
@@ -29,8 +30,10 @@ then
 
     pushd "${WORKDIR}/folly"
 
-    cp -r "${SCRIPTDIR}/patches/folly" patches
-    git apply patches/*
+    if [ -d "${PATCHESDIR}" ]; then
+        cp -r "${PATCHESDIR}" patches
+        git apply patches/*
+    fi
 
     mkdir -p _build
     pushd _build

docker_builds/patches/folly/0003-remove-cxx-std-from-pkgconfig.patch

@@ -1,4 +1,4 @@
-
+// Copyright 2017, 2020. Starry, Inc. All Rights Reserved.
 #pragma once
 
 #include "HookConfig.h"
@@ -35,7 +35,9 @@ folly::Future<folly::Unit> SplitSubprocessesAcrossCores(const T& subprocs,
             {
                 futures.emplace_back(subproc->ExecuteExternalProcess());
             }
-            return folly::collect(futures).thenValue([](auto /*unused*/){ return folly::Unit(); });
+            return folly::collect(futures)
+                .toUnsafeFuture()
+                .thenValue([](auto /*unused*/){ return folly::Unit(); });
         });
     }
     return final_future;