Skip to content

Commit 4649472

Browse files
BarenboimBarenboim
authored
Remove kafka '-fno-rtti' flag. (#1759)
1 parent 0710428 commit 4649472

File tree

10 files changed

+81
-103
lines changed

10 files changed

+81
-103
lines changed

‎BUILD‎

Lines changed: 57 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -196,30 +196,6 @@ cc_library(
196196
visibility = ["//visibility:public"],
197197
)
198198

199-
cc_library(
200-
name = 'kafka_message',
201-
hdrs = [
202-
'src/factory/KafkaTaskImpl.inl',
203-
'src/protocol/KafkaDataTypes.h',
204-
'src/protocol/KafkaMessage.h',
205-
'src/protocol/KafkaResult.h',
206-
'src/protocol/kafka_parser.h',
207-
],
208-
includes = [
209-
'src/factory',
210-
'src/protocol',
211-
],
212-
srcs = [
213-
'src/factory/KafkaTaskImpl.cc',
214-
'src/protocol/KafkaMessage.cc',
215-
'src/protocol/KafkaResult.cc',
216-
],
217-
copts = ['-fno-rtti'],
218-
deps = [
219-
':common',
220-
],
221-
)
222-
223199
cc_library(
224200
name = 'kafka',
225201
hdrs = [
@@ -239,10 +215,12 @@ cc_library(
239215
'src/client/WFKafkaClient.cc',
240216
'src/protocol/KafkaDataTypes.cc',
241217
'src/protocol/kafka_parser.c',
218+
'src/factory/KafkaTaskImpl.cc',
219+
'src/protocol/KafkaMessage.cc',
220+
'src/protocol/KafkaResult.cc',
242221
],
243222
deps = [
244223
':common',
245-
':kafka_message',
246224
],
247225
visibility = ["//visibility:public"],
248226
linkopts = [
@@ -276,37 +254,37 @@ cc_library(
276254
)
277255

278256
cc_binary(
279-
name = 'helloworld',
280-
srcs = ['tutorial/tutorial-00-helloworld.cc'],
281-
deps = [':http'],
257+
name = 'helloworld',
258+
srcs = ['tutorial/tutorial-00-helloworld.cc'],
259+
deps = [':http'],
282260
)
283261
cc_binary(
284-
name = 'wget',
285-
srcs = ['tutorial/tutorial-01-wget.cc'],
286-
deps = [':http'],
262+
name = 'wget',
263+
srcs = ['tutorial/tutorial-01-wget.cc'],
264+
deps = [':http'],
287265
)
288266
cc_binary(
289-
name = 'redis_cli',
290-
srcs = ['tutorial/tutorial-02-redis_cli.cc'],
291-
deps = [':redis'],
267+
name = 'redis_cli',
268+
srcs = ['tutorial/tutorial-02-redis_cli.cc'],
269+
deps = [':redis'],
292270
)
293271

294272
cc_binary(
295-
name = 'wget_to_redis',
296-
srcs = ['tutorial/tutorial-03-wget_to_redis.cc'],
297-
deps = [':http', 'redis'],
273+
name = 'wget_to_redis',
274+
srcs = ['tutorial/tutorial-03-wget_to_redis.cc'],
275+
deps = [':http', 'redis'],
298276
)
299277

300278
cc_binary(
301-
name = 'http_echo_server',
302-
srcs = ['tutorial/tutorial-04-http_echo_server.cc'],
303-
deps = [':http'],
279+
name = 'http_echo_server',
280+
srcs = ['tutorial/tutorial-04-http_echo_server.cc'],
281+
deps = [':http'],
304282
)
305283

306284
cc_binary(
307-
name = 'http_proxy',
308-
srcs = ['tutorial/tutorial-05-http_proxy.cc'],
309-
deps = [':http'],
285+
name = 'http_proxy',
286+
srcs = ['tutorial/tutorial-05-http_proxy.cc'],
287+
deps = [':http'],
310288
)
311289

312290
cc_binary(
@@ -316,21 +294,21 @@ cc_binary(
316294
)
317295

318296
cc_binary(
319-
name = 'sort_task',
320-
srcs = ['tutorial/tutorial-07-sort_task.cc'],
321-
deps = [':common'],
297+
name = 'sort_task',
298+
srcs = ['tutorial/tutorial-07-sort_task.cc'],
299+
deps = [':common'],
322300
)
323301

324302
cc_binary(
325-
name = 'matrix_multiply',
326-
srcs = ['tutorial/tutorial-08-matrix_multiply.cc'],
327-
deps = [':common'],
303+
name = 'matrix_multiply',
304+
srcs = ['tutorial/tutorial-08-matrix_multiply.cc'],
305+
deps = [':common'],
328306
)
329307

330308
cc_binary(
331-
name = 'http_file_server',
332-
srcs = ['tutorial/tutorial-09-http_file_server.cc'],
333-
deps = [':http'],
309+
name = 'http_file_server',
310+
srcs = ['tutorial/tutorial-09-http_file_server.cc'],
311+
deps = [':http'],
334312
)
335313

336314
cc_library(
@@ -340,45 +318,45 @@ cc_library(
340318
)
341319

342320
cc_binary(
343-
name = 'server',
344-
srcs = [
345-
'tutorial/tutorial-10-user_defined_protocol/server.cc',
346-
'tutorial/tutorial-10-user_defined_protocol/message.cc',
347-
],
348-
deps = [':common', ':user_hdrs'],
321+
name = 'server',
322+
srcs = [
323+
'tutorial/tutorial-10-user_defined_protocol/server.cc',
324+
'tutorial/tutorial-10-user_defined_protocol/message.cc',
325+
],
326+
deps = [':common', ':user_hdrs'],
349327
)
350328

351329
cc_binary(
352-
name = 'client',
353-
srcs = [
354-
'tutorial/tutorial-10-user_defined_protocol/client.cc',
355-
'tutorial/tutorial-10-user_defined_protocol/message.cc',
356-
],
357-
deps = [':common', ':user_hdrs'],
330+
name = 'client',
331+
srcs = [
332+
'tutorial/tutorial-10-user_defined_protocol/client.cc',
333+
'tutorial/tutorial-10-user_defined_protocol/message.cc',
334+
],
335+
deps = [':common', ':user_hdrs'],
358336
)
359337

360338
cc_binary(
361-
name = 'graph_task',
362-
srcs = ['tutorial/tutorial-11-graph_task.cc'],
363-
deps = [':http'],
339+
name = 'graph_task',
340+
srcs = ['tutorial/tutorial-11-graph_task.cc'],
341+
deps = [':http'],
364342
)
365343

366344
cc_binary(
367-
name = 'mysql_cli',
368-
srcs = ['tutorial/tutorial-12-mysql_cli.cc'],
369-
deps = [':mysql'],
345+
name = 'mysql_cli',
346+
srcs = ['tutorial/tutorial-12-mysql_cli.cc'],
347+
deps = [':mysql'],
370348
)
371349

372350
cc_binary(
373-
name = 'kafka_cli',
374-
srcs = ['tutorial/tutorial-13-kafka_cli.cc'],
375-
deps = [':kafka', ':workflow_hdrs'],
351+
name = 'kafka_cli',
352+
srcs = ['tutorial/tutorial-13-kafka_cli.cc'],
353+
deps = [':kafka', ':workflow_hdrs'],
376354
)
377355

378356
cc_binary(
379-
name = 'consul_cli',
380-
srcs = ['tutorial/tutorial-14-consul_cli.cc'],
381-
deps = [':consul'],
357+
name = 'consul_cli',
358+
srcs = ['tutorial/tutorial-14-consul_cli.cc'],
359+
deps = [':consul'],
382360
)
383361

384362
cc_binary(
@@ -409,9 +387,9 @@ cc_binary(
409387
)
410388

411389
cc_binary(
412-
name = 'redis_subscriber',
413-
srcs = ['tutorial/tutorial-18-redis_subscriber.cc'],
414-
deps = [':redis'],
390+
name = 'redis_subscriber',
391+
srcs = ['tutorial/tutorial-18-redis_subscriber.cc'],
392+
deps = [':redis'],
415393
)
416394

417395
cc_binary(

‎src/factory/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@ if (KAFKA STREQUAL "y")
3333
KafkaTaskImpl.cc
3434
)
3535
add_library("factory_kafka" OBJECT ${SRC})
36-
set_property(SOURCE KafkaTaskImpl.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
3736
endif ()

‎src/factory/xmake.lua‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ target("kafka_factory")
1313
if has_config("kafka") then
1414
add_files("KafkaTaskImpl.cc")
1515
set_kind("object")
16-
add_cxxflags("-fno-rtti")
1716
add_deps("factory")
1817
add_packages("zlib", "snappy", "zstd", "lz4")
1918
else

‎src/include/workflow/dns_types.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../protocol/dns_types.h

‎src/protocol/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,4 @@ if (KAFKA STREQUAL "y")
4343
KafkaResult.cc
4444
)
4545
add_library("protocol_kafka" OBJECT ${SRC})
46-
set_property(SOURCE KafkaMessage.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
47-
set_property(SOURCE KafkaResult.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
4846
endif ()

‎src/protocol/KafkaDataTypes.cc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,4 +664,12 @@ const KafkaMeta *get_meta(const char *topic, KafkaMetaList *meta_list)
664664
return NULL;
665665
}
666666

667+
KafkaSnappySink::~KafkaSnappySink()
668+
{
669+
}
670+
671+
KafkaSnappySource::~KafkaSnappySource()
672+
{
673+
}
674+
667675
} /* namespace protocol */

‎src/protocol/KafkaDataTypes.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,6 +1609,9 @@ class KafkaSnappySink : public snappy::Sink
16091609

16101610
private:
16111611
KafkaBuffer *buffer;
1612+
1613+
public:
1614+
virtual ~KafkaSnappySink();
16121615
};
16131616

16141617
class KafkaSnappySource : public snappy::Source
@@ -1643,6 +1646,9 @@ class KafkaSnappySource : public snappy::Source
16431646
KafkaBuffer *buffer;
16441647
size_t buf_size;
16451648
size_t pos;
1649+
1650+
public:
1651+
virtual ~KafkaSnappySource();
16461652
};
16471653

16481654
}

‎src/protocol/KafkaResult.cc‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ enum
2727
KAFKA_STATUS_END,
2828
};
2929

30-
KafkaResult::KafkaResult()
31-
{
32-
this->resp_vec = NULL;
33-
this->resp_num = 0;
34-
}
35-
3630
KafkaResult::~KafkaResult()
3731
{
3832
delete []this->resp_vec;

‎src/protocol/KafkaResult.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ class KafkaResult
4343
void set_resp(KafkaResponse&& resp, size_t i);
4444

4545
public:
46-
KafkaResult();
46+
KafkaResult()
47+
{
48+
this->resp_vec = NULL;
49+
this->resp_num = 0;
50+
}
4751

4852
virtual ~KafkaResult();
4953

‎src/protocol/xmake.lua‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,14 @@ target("protocol")
3636
set_kind("object")
3737
add_deps("basic_protocol", "mysql_protocol", "redis_protocol")
3838

39-
target("kafka_message")
40-
if has_config("kafka") then
41-
add_files("KafkaMessage.cc",
42-
"KafkaResult.cc")
43-
set_kind("object")
44-
add_cxxflags("-fno-rtti")
45-
add_packages("lz4", "zstd", "zlib", "snappy")
46-
else
47-
set_kind("phony")
48-
end
49-
5039
target("kafka_protocol")
5140
if has_config("kafka") then
5241
set_kind("object")
5342
add_files("kafka_parser.c",
54-
"KafkaDataTypes.cc")
55-
add_deps("kafka_message", "protocol")
43+
"KafkaDataTypes.cc",
44+
"KafkaMessage.cc",
45+
"KafkaResult.cc")
46+
add_deps("basic_protocol")
5647
add_packages("zlib", "snappy", "zstd", "lz4")
5748
else
5849
set_kind("phony")

0 commit comments

Comments
 (0)