1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
Description: Use Debian package libjsonparser rather than bundled json.c
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2020-12-08
Forwarded: no
--- a/chirp/src/chirp_job.c
+++ b/chirp/src/chirp_job.c
@@ -22,7 +22,7 @@
#include "buffer.h"
#include "debug.h"
-#include "json.h"
+#include <json-parser/json.h>
#include "json_aux.h"
#include "macros.h"
#include "path.h"
--- a/chirp/src/chirp_job.h
+++ b/chirp/src/chirp_job.h
@@ -7,7 +7,7 @@
#ifndef CHIRP_JOB_H
#define CHIRP_JOB_H
-#include "json.h"
+#include <json-parser/json.h>
#include "chirp_types.h"
--- a/chirp/src/chirp_server.c
+++ b/chirp/src/chirp_server.c
@@ -30,7 +30,7 @@
#include "getopt_aux.h"
#include "host_disk_info.h"
#include "host_memory_info.h"
-#include "json.h"
+#include <json-parser/json.h>
#include "jx.h"
#include "jx_print.h"
#include "link.h"
--- a/chirp/src/confuga_job.c
+++ b/chirp/src/confuga_job.c
@@ -7,7 +7,7 @@
#include "confuga_fs.h"
#include "debug.h"
-#include "json.h"
+#include <json-parser/json.h>
#include "json_aux.h"
#include "catch.h"
--- a/chirp/src/confuga_replica.c
+++ b/chirp/src/confuga_replica.c
@@ -13,7 +13,7 @@
#include "catalog_query.h"
#include "catch.h"
#include "debug.h"
-#include "json.h"
+#include <json-parser/json.h>
#include "json_aux.h"
#include "nvpair.h"
#include "sha1.h"
--- a/chirp/src/json_aux.c
+++ b/chirp/src/json_aux.c
@@ -1,6 +1,6 @@
#include "buffer.h"
#include "copy_stream.h"
-#include "json.h"
+#include <json-parser/json.h>
#include "json_aux.h"
#include <assert.h>
--- a/chirp/src/json_aux.h
+++ b/chirp/src/json_aux.h
@@ -2,7 +2,7 @@
#define JSON_AUX_H
#include "buffer.h"
-#include "json.h"
+#include <json-parser/json.h>
#define jistype(o,t) ((o)->type == (t))
--- a/chirp/src/Makefile
+++ b/chirp/src/Makefile
@@ -7,7 +7,7 @@
LOCAL_CCFLAGS = -DSQLITE_DEFAULT_MMAP_SIZE=1073741824 -DSQLITE_TEMP_STORE=3 -DSQLITE_THREADSAFE=0 -fstack-protector-all
# Globus is needed by all executables via libdttools.a/auth_globus.o
-LOCAL_LINKAGE = $(CCTOOLS_GLOBUS_LDFLAGS) -lsqlite3
+LOCAL_LINKAGE = $(CCTOOLS_GLOBUS_LDFLAGS) -lsqlite3 -ljsonparser
EXTERNAL_DEPENDENCIES = ../../dttools/src/libdttools.a
LIBRARIES = libchirp.a libconfuga.a
@@ -22,7 +22,7 @@
PUBLIC_HEADERS = chirp_global.h chirp_multi.h chirp_reli.h chirp_client.h chirp_stream.h chirp_protocol.h chirp_matrix.h chirp_types.h chirp_recursive.h confuga.h
SCRIPTS = chirp_audit_cluster chirp_server_hdfs
SOURCES_CONFUGA = confuga.c confuga_namespace.c confuga_replica.c confuga_node.c confuga_job.c confuga_file.c confuga_gc.c
-SOURCES_LIBRARY = chirp_global.c chirp_multi.c chirp_recursive.c chirp_reli.c chirp_client.c chirp_matrix.c chirp_stream.c chirp_ticket.c json.c json_aux.c
+SOURCES_LIBRARY = chirp_global.c chirp_multi.c chirp_recursive.c chirp_reli.c chirp_client.c chirp_matrix.c chirp_stream.c chirp_ticket.c json_aux.c
SOURCES_SERVER = chirp_stats.c chirp_thirdput.c chirp_alloc.c chirp_audit.c chirp_acl.c chirp_group.c chirp_filesystem.c chirp_fs_hdfs.c chirp_fs_local.c chirp_fs_local_scheduler.c chirp_fs_chirp.c chirp_fs_confuga.c chirp_job.c chirp_sqlite.c
TARGETS = $(PROGRAMS) $(LIBRARIES)
--- a/configure
+++ b/configure
@@ -1302,7 +1302,7 @@
then
static_libraries="../../dttools/src/libdttools.a ${zlib_path}/lib/libz.a"
else
- external_libraries="${external_libraries} -lstdc++ -lpthread -lz -lc -lm"
+ external_libraries="${external_libraries} -lstdc++ -lpthread -lz -lc -lm -ljsonparser"
fi
if [ $BUILD_SYS = DARWIN ]
|