Change kDefaultZeroCopyThreshold to 0 to avoid a regression and avoid a failure while...

[folly.git] / folly / io / async / test / ScopedEventBaseThreadTest.cpp

diff --git a/folly/io/async/test/ScopedEventBaseThreadTest.cpp b/folly/io/async/test/ScopedEventBaseThreadTest.cpp
index 6d7ba4c149852e19d98368ebbbe680abd2b2c441..6f1d226672cb037169fd122cf5e033ee8fcc929e 100644 (file)
--- a/folly/io/async/test/ScopedEventBaseThreadTest.cpp
+++ b/folly/io/async/test/ScopedEventBaseThreadTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,13 @@
 #include <folly/io/async/ScopedEventBaseThread.h>
 
 #include <chrono>
+#include <string>
+
 #include <folly/Baton.h>
+#include <folly/Optional.h>
+#include <folly/io/async/EventBaseManager.h>
 #include <folly/portability/GTest.h>
+#include <folly/system/ThreadName.h>
 
 using namespace std;
 using namespace std::chrono;
@@ -34,47 +39,22 @@ TEST_F(ScopedEventBaseThreadTest, example) {
   ASSERT_TRUE(done.timed_wait(seconds(1)));
 }
 
-TEST_F(ScopedEventBaseThreadTest, start_stop) {
-  ScopedEventBaseThread sebt(false);
-
-  for (size_t i = 0; i < 4; ++i) {
-    EXPECT_EQ(nullptr, sebt.getEventBase());
-    sebt.start();
-    EXPECT_NE(nullptr, sebt.getEventBase());
-
-    Baton<> done;
-    sebt.getEventBase()->runInEventBaseThread([&] { done.post(); });
-    ASSERT_TRUE(done.timed_wait(seconds(1)));
-
-    EXPECT_NE(nullptr, sebt.getEventBase());
-    sebt.stop();
-    EXPECT_EQ(nullptr, sebt.getEventBase());
-  }
-}
-
-TEST_F(ScopedEventBaseThreadTest, move) {
-  auto sebt0 = ScopedEventBaseThread();
-  auto sebt1 = std::move(sebt0);
-  auto sebt2 = std::move(sebt1);
-
-  EXPECT_EQ(nullptr, sebt0.getEventBase());
-  EXPECT_EQ(nullptr, sebt1.getEventBase());
-  EXPECT_NE(nullptr, sebt2.getEventBase());
+TEST_F(ScopedEventBaseThreadTest, named_example) {
+  static constexpr StringPiece kThreadName{"named_example"};
 
+  Optional<std::string> createdThreadName;
   Baton<> done;
-  sebt2.getEventBase()->runInEventBaseThread([&] { done.post(); });
-  ASSERT_TRUE(done.timed_wait(seconds(1)));
-}
 
-TEST_F(ScopedEventBaseThreadTest, self_move) {
-  ScopedEventBaseThread sebt0;
-  auto sebt = std::move(sebt0);
+  ScopedEventBaseThread sebt{kThreadName};
+  sebt.getEventBase()->runInEventBaseThread([&] {
+    createdThreadName = folly::getCurrentThreadName();
+    done.post();
+  });
 
-  EXPECT_NE(nullptr, sebt.getEventBase());
-
-  Baton<> done;
-  sebt.getEventBase()->runInEventBaseThread([&] { done.post(); });
   ASSERT_TRUE(done.timed_wait(seconds(1)));
+  if (createdThreadName) {
+    ASSERT_EQ(kThreadName.toString(), createdThreadName.value());
+  }
 }
 
 TEST_F(ScopedEventBaseThreadTest, default_manager) {
@@ -94,3 +74,17 @@ TEST_F(ScopedEventBaseThreadTest, custom_manager) {
   sebt_eb->runInEventBaseThreadAndWait([&] { ebm_eb = ebm.getEventBase(); });
   EXPECT_EQ(uintptr_t(sebt_eb), uintptr_t(ebm_eb));
 }
+
+TEST_F(ScopedEventBaseThreadTest, eb_dtor_in_io_thread) {
+  Optional<ScopedEventBaseThread> sebt;
+  sebt.emplace();
+  auto const io_thread_id = sebt->getThreadId();
+  EXPECT_NE(this_thread::get_id(), io_thread_id) << "sanity";
+
+  auto const eb = sebt->getEventBase();
+  thread::id eb_dtor_thread_id;
+  eb->runOnDestruction(new EventBase::FunctionLoopCallback(
+      [&] { eb_dtor_thread_id = this_thread::get_id(); }));
+  sebt.clear();
+  EXPECT_EQ(io_thread_id, eb_dtor_thread_id);
+}