ARROW-4418 [Plasma] replace event loop with boost::asio for plasma store

LICENSE.txt

@@ -221,37 +221,6 @@ limitations under the License.
 
 --------------------------------------------------------------------------------
 
-src/plasma/thirdparty/ae: Modified / 3-Clause BSD
-
-Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
- * Neither the name of Redis nor the names of its contributors may be used
-   to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------------------
-
 src/plasma/thirdparty/dlmalloc.c: CC0
 
 This is a version (aka dlmalloc) of malloc/free/realloc written by
@@ -378,7 +347,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 
-This project includes code from the Boost project
+This project includes code from the Boost project and independent Asio headers
 
 Boost Software License - Version 1.0 - August 17th, 2003
 

cpp/apidoc/tutorials/plasma.md

@@ -384,16 +384,14 @@ sealed in the object store. This may especially be handy when your
 program is collaborating with other Plasma clients, and needs to know
 when they make objects available.
 
-First, you can subscribe your current Plasma client to such notifications
-by getting a file descriptor:
+First, you can subscribe your current Plasma client to such notifications:
 
 ```cpp
 // Start receiving notifications into file_descriptor.
-int fd;
-ARROW_CHECK_OK(client.Subscribe(&fd));
+ARROW_CHECK_OK(client.Subscribe());
 ```
 
-Once you have the file descriptor, you can have your current Plasma client
+Once you have subscribed, you can have your current Plasma client
 wait to receive the next object notification. Object notifications
 include information such as Object ID, data size, and metadata size of
 the next newly available object:
@@ -404,7 +402,7 @@ the next newly available object:
 ObjectID object_id;
 int64_t data_size;
 int64_t metadata_size;
-ARROW_CHECK_OK(client.GetNotification(fd, &object_id, &data_size, &metadata_size));
+ARROW_CHECK_OK(client.GetNotification(&object_id, &data_size, &metadata_size));
 
 // Get the newly available object.
 ObjectBuffer object_buffer;
@@ -423,14 +421,13 @@ int main(int argc, char** argv) {
   PlasmaClient client;
   ARROW_CHECK_OK(client.Connect("/tmp/plasma"));
 
-  int fd;
-  ARROW_CHECK_OK(client.Subscribe(&fd));
+  ARROW_CHECK_OK(client.Subscribe());
 
   ObjectID object_id;
   int64_t data_size;
   int64_t metadata_size;
   while (true) {
-    ARROW_CHECK_OK(client.GetNotification(fd, &object_id, &data_size, &metadata_size));
+    ARROW_CHECK_OK(client.GetNotification(&object_id, &data_size, &metadata_size));
 
     std::cout << "Received object notification for object_id = "
               << object_id.hex() << ", with data_size = " << data_size

cpp/src/plasma/CMakeLists.txt

@@ -65,22 +65,29 @@ add_custom_command(
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 
+# Set compiling options for asio headers.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-conversion -Wno-documentation")
+
+set(PLASMA_IO_SRCS
+    fling.cc
+    io/basic_connection.cc
+    io/connection.cc
+    protocol.cc)
+
 set(PLASMA_SRCS
     client.cc
     common.cc
-    fling.cc
-    io.cc
     malloc.cc
     plasma.cc
-    protocol.cc)
+    protocol.cc
+    ${PLASMA_IO_SRCS})
 
 set(PLASMA_STORE_SRCS
     dlmalloc.cc
-    events.cc
     eviction_policy.cc
     plasma_allocator.cc
-    store.cc
-    thirdparty/ae/ae.c)
+    ${PLASMA_IO_SRCS}
+    store.cc)
 
 set(PLASMA_LINK_LIBS arrow_shared)
 set(PLASMA_STATIC_LINK_LIBS arrow_static)
@@ -141,12 +148,14 @@ list(APPEND PLASMA_EXTERNAL_STORE_SOURCES "external_store.cc" "hash_table_store.
 # We use static libraries for the plasma_store_server executable so that it can
 # be copied around and used in different locations.
 add_executable(plasma_store_server ${PLASMA_EXTERNAL_STORE_SOURCES} ${PLASMA_STORE_SRCS})
+
 if(ARROW_BUILD_STATIC)
   target_link_libraries(plasma_store_server plasma_static ${PLASMA_STATIC_LINK_LIBS})
 else()
   # Fallback to shared libs in the case that static libraries are not build.
   target_link_libraries(plasma_store_server plasma_shared ${PLASMA_LINK_LIBS})
 endif()
+
 add_dependencies(plasma plasma_store_server)
 
 if(ARROW_RPATH_ORIGIN)
@@ -174,11 +183,7 @@ elseif(APPLE)
   endif()
 endif()
 
-install(FILES common.h
-              compat.h
-              client.h
-              events.h
-              test-util.h
+install(FILES common.h compat.h client.h test-util.h
         DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/plasma")
 
 # Plasma store