Skip to content

Commit 0907520

Browse files
leheckalehecka
committed
fixing formatting
1 parent b994b3d commit 0907520

File tree

16 files changed

+463
-154
lines changed

16 files changed

+463
-154
lines changed

‎.travis.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ language: cpp
88
# Test matrix:
99
matrix:
1010
include:
11-
- env: CLANG_VERSION=3.6 BUILD_TYPE=Debug CPP_VERSION=14 ASAN=On
11+
- env: CLANG_VERSION=3.9 BUILD_TYPE=Debug CPP_VERSION=14 ASAN=On
1212
os: linux
13-
addons: &clang36
13+
addons: &clang39
1414
apt:
1515
packages:
16-
- clang-3.6
16+
- clang-3.9
1717
- valgrind
1818
sources:
1919
- ubuntu-toolchain-r-test
20-
- llvm-toolchain-precise-3.6
20+
- llvm-toolchain-precise-3.9
2121

2222
- env: GCC_VERSION=4.9 BUILD_TYPE=Debug CPP_VERSION=14 ASAN=On
2323
os: linux
@@ -71,6 +71,6 @@ script:
7171
- ./experimental/yarpl/yarpl-tests
7272
- cd ..
7373
- ./scripts/prepare_tck_drivers.sh
74-
- ./scripts/tck_test.sh -c cpp -s cpp
75-
- ./scripts/tck_test.sh -c java -s java
76-
- ./scripts/tck_test.sh -c java -s cpp
74+
- ./scripts/tck_test.sh -c cpp -s cpp
75+
- ./scripts/tck_test.sh -c java -s java
76+
- ./scripts/tck_test.sh -c java -s cpp

‎TARGETS‎

Lines changed: 176 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@ cpp_library(
66
('src', '**/*.h')
77
]),
88
srcs = [
9+
'src/Common.cpp',
910
'src/Executor.cpp',
11+
'src/Frame.cpp',
12+
'src/FrameSerializer.cpp',
13+
'src/Payload.cpp',
14+
'src/versions/FrameSerializer_v0.cpp',
15+
'src/versions/FrameSerializer_v0_1.cpp',
16+
'src/versions/FrameSerializer_v1_0.cpp',
1017
],
1118
deps = [
1219
'@/folly/futures:futures',
@@ -35,7 +42,6 @@ cpp_library(
3542
'src/framed/FramedWriter.cpp',
3643
'src/framed/FramedDuplexConnection.cpp',
3744
'src/folly/FollyKeepaliveTimer.cpp',
38-
'src/Payload.cpp',
3945
],
4046
deps = [
4147
':reactivesocket-internal',
@@ -50,16 +56,15 @@ cpp_library(
5056
name = 'reactivesocket',
5157

5258
headers = [
59+
'src/Common.h',
5360
'src/ClientResumeStatusCallback.h',
5461
'src/EnableSharedFromThis.h',
5562
'src/FrameTransport.h',
5663
'src/NullRequestHandler.h',
5764
'src/Payload.h',
58-
'src/ReactiveSocket.h',
5965
'src/RequestHandler.h',
60-
'src/ResumeTracker.h',
61-
'src/SmartPointers.h', #will be removed soon
62-
'src/StandardReactiveSocket.h',
66+
'src/ServerConnectionAcceptor.h',
67+
'src/ReactiveSocket.h',
6368
'src/Stats.h',
6469
'src/StreamsFactory.h',
6570
'src/SubscriberBase.h',
@@ -68,22 +73,17 @@ cpp_library(
6873
srcs = glob([
6974
'src/AbstractStreamAutomaton.cpp',
7075
'src/automata/*.cpp',
71-
'src/mixins/*.cpp',
72-
'src/versions/*.cpp',
73-
'src/Common.cpp',
7476
'src/ConnectionAutomaton.cpp',
7577
'src/ConnectionSetupPayload.cpp',
76-
'src/Frame.cpp',
77-
'src/FrameSerializer.cpp',
7878
'src/FrameTransport.cpp',
7979
'src/NullRequestHandler.cpp',
80-
'src/mixins/*.cpp', # temporarily
8180
'src/Payload.cpp',
8281
'src/RequestHandler.cpp',
8382
'src/ResumeCache.cpp',
84-
'src/ResumeTracker.cpp',
85-
'src/StandardReactiveSocket.cpp',
83+
'src/ServerConnectionAcceptor.cpp',
84+
'src/ReactiveSocket.cpp',
8685
'src/Stats.cpp',
86+
'src/StreamState.cpp',
8787
'src/StreamsFactory.cpp',
8888
]),
8989
deps = [
@@ -139,7 +139,7 @@ cpp_library(
139139
':reactivesocket-streams-mocks',
140140
],
141141
external_deps=[
142-
'gmock',
142+
('googletest', None, 'gmock'),
143143
],
144144
)
145145

@@ -152,7 +152,9 @@ cpp_unittest(
152152
]),
153153
srcs = glob([
154154
'test/*.cpp',
155+
'test/folly/*.cpp',
155156
'test/framed/*.cpp',
157+
'test/automata/*.cpp',
156158
'test/simple/*.cpp',
157159
]),
158160
deps = [
@@ -163,8 +165,134 @@ cpp_unittest(
163165
'@/folly/io/async:scoped_event_base_thread',
164166
],
165167
external_deps = [
166-
'gmock',
167-
'gtest',
168+
('googletest', None, 'gmock'),
169+
('googletest', None, 'gtest'),
170+
],
171+
)
172+
173+
cpp_library(
174+
name='reactivesocket-tests-internal',
175+
header_namespace = 'test',
176+
headers = subdir_glob([
177+
('test', '**/*.h'),
178+
]),
179+
srcs=[
180+
'test/simple/StatsPrinter.cpp',
181+
],
182+
deps=[
183+
':reactivesocket',
184+
],
185+
)
186+
187+
cpp_binary(
188+
name = 'reactivesocket-tck-server',
189+
header_namespace = 'tck-test',
190+
headers = subdir_glob([
191+
('tck-test', '**/*.h'),
192+
]),
193+
srcs = glob([
194+
'tck-test/server.cpp',
195+
'tck-test/MarbleProcessor.cpp',
196+
]),
197+
deps = [
198+
':reactivesocket-tcp',
199+
':reactivesocket',
200+
':reactivesocket-streams-mocks',
201+
':reactivesocket-tests-internal',
202+
'@/folly/io/async:scoped_event_base_thread',
203+
],
204+
)
205+
206+
cpp_binary(
207+
name = 'reactivesocket-tck-client',
208+
header_namespace = 'tck-test',
209+
headers = subdir_glob([
210+
('tck-test', '**/*.h'),
211+
]),
212+
srcs = glob([
213+
'tck-test/client.cpp',
214+
'tck-test/TestFileParser.cpp',
215+
'tck-test/TestInterpreter.cpp',
216+
'tck-test/TestSubscriber.cpp',
217+
'tck-test/TestSuite.cpp',
218+
]),
219+
deps = [
220+
':reactivesocket-tcp',
221+
':reactivesocket',
222+
':reactivesocket-streams-mocks',
223+
'@/folly/io/async:scoped_event_base_thread',
224+
],
225+
)
226+
227+
cpp_binary(
228+
name = 'reactivesocket-test-resumeclient',
229+
header_namespace = 'test',
230+
headers = subdir_glob([
231+
('test', '**/*.h'),
232+
]),
233+
srcs = glob([
234+
'test/resume/TcpResumeClient.cpp',
235+
'test/simple/*.cpp',
236+
]),
237+
deps = [
238+
':reactivesocket-tcp',
239+
':reactivesocket',
240+
':reactivesocket-streams-mocks',
241+
'@/folly/io/async:scoped_event_base_thread',
242+
],
243+
)
244+
245+
cpp_binary(
246+
name = 'reactivesocket-test-resumeserver',
247+
header_namespace = 'test',
248+
headers = subdir_glob([
249+
('test', '**/*.h'),
250+
]),
251+
srcs = glob([
252+
'test/resume/TcpResumeServer.cpp',
253+
'test/simple/*.cpp',
254+
]),
255+
deps = [
256+
':reactivesocket-tcp',
257+
':reactivesocket',
258+
':reactivesocket-streams-mocks',
259+
'@/folly/io/async:scoped_event_base_thread',
260+
],
261+
)
262+
263+
cpp_binary(
264+
name = 'reactivesocket-test-tcpclient',
265+
header_namespace = 'test',
266+
headers = subdir_glob([
267+
('test', '**/*.h'),
268+
]),
269+
srcs = glob([
270+
'test/tcp/TcpClient.cpp',
271+
'test/simple/*.cpp',
272+
]),
273+
deps = [
274+
':reactivesocket-tcp',
275+
':reactivesocket',
276+
':reactivesocket-streams-mocks',
277+
'@/folly/io/async:scoped_event_base_thread',
278+
],
279+
)
280+
281+
cpp_binary(
282+
name = 'reactivesocket-test-tcpserver',
283+
header_namespace = 'test',
284+
headers = subdir_glob([
285+
('test', '**/*.h'),
286+
]),
287+
srcs = glob([
288+
'test/tcp/TcpServer.cpp',
289+
'test/simple/*.cpp',
290+
]),
291+
deps = [
292+
':reactivesocket-tcp',
293+
':reactivesocket',
294+
':reactivesocket-streams-mocks',
295+
'@/folly/io/async:scoped_event_base_thread',
168296
],
169297
)
170298

@@ -183,3 +311,35 @@ cpp_library(
183311
headers = ['test/ReactiveStreamsMocksCompat.h', 'test/streams/Mocks.h'],
184312
deps = ['@/lithium/reactive-streams-cpp:reactive-streams-mocks',],
185313
)
314+
315+
cpp_library(
316+
name = 'rsocket',
317+
318+
header_namespace = "rsocket",
319+
headers = subdir_glob([
320+
('experimental/rsocket', '**/*.h'),
321+
('experimental/rsocket/facebook', '**/*.h'),
322+
('experimental/rsocket/transports', '**/*.h'),
323+
]),
324+
srcs = glob([
325+
'experimental/rsocket-src/*.cpp',
326+
'experimental/rsocket-src/facebook/transports/*.cpp',
327+
'experimental/rsocket-src/transports/*.cpp',
328+
]),
329+
deps = [
330+
':reactivesocket',
331+
':reactivesocket-internal',
332+
':reactivesocket-streams',
333+
':reactivesocket-tcp',
334+
'@/folly/futures:futures',
335+
'@/folly/io:iobuf',
336+
'@/folly:exception_wrapper',
337+
'@/lithium/duplexconnection-proxygen:server',
338+
'@/lithium/duplexconnection:util',
339+
'@/lithium/reactivesocket-cpp/experimental/yarpl:reactive-streams',
340+
'@/lithium/reactivesocket-cpp/experimental/yarpl:yarpl',
341+
'@/lithium/reactivesocket-utils:reactivesocket-external-utils',
342+
'@/proxygen/httpserver:httpserver',
343+
],
344+
compiler_flags=['-DREACTIVE_SOCKET_EXTERNAL_STACK_TRACE_UTILS'],
345+
)

‎examples/stream-hello-world/TARGETS‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
cpp_binary(
2+
name = 'tcp-server',
3+
headers = subdir_glob([('.', '**/*.h')]),
4+
srcs = [
5+
'HelloStreamRequestHandler.cpp',
6+
'HelloStreamSubscription.cpp',
7+
'StreamHelloWorld_Server.cpp',
8+
],
9+
deps = [
10+
'@/folly/init:init',
11+
'@/lithium/reactivesocket-cpp:rsocket',
12+
],
13+
)
14+
15+
cpp_binary(
16+
name = 'tcp-client',
17+
headers = subdir_glob([('.', '**/*.h')]),
18+
srcs = [
19+
'HelloStreamRequestHandler.cpp',
20+
'HelloStreamSubscription.cpp',
21+
'StreamHelloWorld_Client.cpp',
22+
],
23+
deps = [
24+
'@/folly/init:init',
25+
'@/lithium/reactivesocket-cpp/examples/util:subscriber',
26+
'@/lithium/reactivesocket-cpp:rsocket',
27+
],
28+
)

‎examples/util/TARGETS‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
cpp_library(
3+
name = 'subscriber',
4+
header_namespace = 'examples/util',
5+
headers = ['ExampleSubscriber.h'],
6+
srcs = ['ExampleSubscriber.cpp'],
7+
deps = ['@/lithium/reactivesocket-cpp:reactivesocket'],
8+
)

‎experimental/rsocket-test/RSocketClientServerTest.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#include "handlers/HelloStreamRequestHandler.h"
99
#include "rsocket/RSocket.h"
10-
#include "rsocket/RSocket.h"
1110
#include "rsocket/transports/TcpConnectionAcceptor.h"
1211

1312
using namespace rsocket;

0 commit comments

Comments
 (0)