Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert task_spec to flatbuffers #255

Merged
merged 23 commits into from
Mar 5, 2017
Merged

Convert task_spec to flatbuffers #255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f2fe657
convert Ray to C++
pcmoritz Mar 1, 2017
da01fdf
convert task_spec to flatbuffers
pcmoritz Mar 2, 2017
73909d8
fix
pcmoritz Mar 2, 2017
2062f36
it compiles
pcmoritz Mar 2, 2017
958b1f8
latest
pcmoritz Mar 4, 2017
52453ea
tests are passing
pcmoritz Mar 4, 2017
b877a34
task2 -> task
pcmoritz Mar 4, 2017
81cbc86
fix
pcmoritz Mar 5, 2017
bc51236
fix
pcmoritz Mar 5, 2017
d5615e4
fix
pcmoritz Mar 5, 2017
ca012f7
fix
pcmoritz Mar 5, 2017
f3eb034
fix
pcmoritz Mar 5, 2017
fca1ce3
linting
pcmoritz Mar 5, 2017
b6caed7
fix valgrind
pcmoritz Mar 5, 2017
5a133d2
upgrade flatbuffers
pcmoritz Mar 5, 2017
fc06d38
use debug mode for valgrind
pcmoritz Mar 5, 2017
6adcb34
fix naming and comments
pcmoritz Mar 5, 2017
193c414
downgrade flatbuffers
pcmoritz Mar 5, 2017
0c9d5ad
fix linting
pcmoritz Mar 5, 2017
e485636
reintroduce TaskSpec_free
pcmoritz Mar 5, 2017
0a4922e
rename TaskSpec -> TaskInfo
pcmoritz Mar 5, 2017
f6abba3
refactoring
pcmoritz Mar 5, 2017
6018731
linting
pcmoritz Mar 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
task2 -> task
  • Loading branch information
@pcmoritz
pcmoritz committed Mar 4, 2017
commit b877a349046f5f9e9a131846e445b811a45a36f0
28 changes: 1 addition & 27 deletions src/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,34 +51,12 @@ add_library(common STATIC

add_dependencies(common gen_common_fbs)

add_library(common2 STATIC
event_loop.cc
common.cc
common_protocol.cc
task2.cc
io.cc
net.cc
logging.cc
state/redis.cc
state/table.cc
state/object_table.cc
state/task_table.cc
state/db_client_table.cc
state/actor_notification_table.cc
state/local_scheduler_table.cc
thirdparty/ae/ae.c
thirdparty/sha256.c)

add_dependencies(common2 gen_common_fbs)

target_link_libraries(common2 "${CMAKE_CURRENT_LIST_DIR}/thirdparty/hiredis/libhiredis.a")

target_link_libraries(common "${CMAKE_CURRENT_LIST_DIR}/thirdparty/hiredis/libhiredis.a")

function(define_test test_name library)
add_executable(${test_name} test/${test_name}.cc ${ARGN})
add_dependencies(${test_name} hiredis flatbuffers_ep)
target_link_libraries(${test_name} common2 ${FLATBUFFERS_STATIC_LIB} ${library})
target_link_libraries(${test_name} common ${FLATBUFFERS_STATIC_LIB} ${library})
target_compile_options(${test_name} PUBLIC "-DPLASMA_TEST -DLOCAL_SCHEDULER_TEST -DCOMMON_TEST -DRAY_COMMON_LOG_LEVEL=4 -DRAY_TIMEOUT=50")
endfunction()

Expand All @@ -90,10 +68,6 @@ define_test(redis_tests "")
define_test(task_table_tests "")
define_test(object_table_tests "")

add_executable(task_tests2 test/task_tests2.cc)
add_dependencies(task_tests2 flatcc)
target_link_libraries(task_tests2 common2 ${FLATBUFFERS_STATIC_LIB})

add_custom_target(
redis
COMMAND make
Expand Down
2 changes: 1 addition & 1 deletion src/common/lib/python/common_extension.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "common.h"
#include "common_extension.h"
#include "task2.h"
#include "task.h"
#include "utarray.h"
#include "utstring.h"

Expand Down
2 changes: 1 addition & 1 deletion src/common/state/actor_notification_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef ACTOR_NOTIFICATION_TABLE_H
#define ACTOR_NOTIFICATION_TABLE_H

#include "task2.h"
#include "task.h"
#include "db.h"
#include "table.h"

Expand Down
2 changes: 1 addition & 1 deletion src/common/state/local_scheduler_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "db.h"
#include "table.h"
#include "task2.h"
#include "task.h"

/** This struct is sent with heartbeat messages from the local scheduler to the
* global scheduler, and it contains information about the load on the local
Expand Down
2 changes: 1 addition & 1 deletion src/common/state/object_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "common.h"
#include "table.h"
#include "db.h"
#include "task2.h"
#include "task.h"

/*
* ==== Lookup call and callback ====
Expand Down
2 changes: 1 addition & 1 deletion src/common/state/redis.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extern "C" {
#include "local_scheduler_table.h"
#include "object_table.h"
#include "object_info.h"
#include "task2.h"
#include "task.h"
#include "task_table.h"
#include "event_loop.h"
#include "redis.h"
Expand Down
2 changes: 1 addition & 1 deletion src/common/state/task_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "db.h"
#include "table.h"
#include "task2.h"
#include "task.h"

/**
* The task table is a message bus that is used for communication between local
Expand Down
Loading