json: Move from lib to include/openvswitch.

To easily allow both in- and out-of-tree building of the Python wrapper for the OVS JSON parser (e.g. w/ pip), move json.h to include/openvswitch. This also requires moving lib/{hmap,shash}.h. Both hmap.h and shash.h were #include-ing "util.h" even though the headers themselves did not use anything from there, but rather from include/openvswitch/util.h. Fixing that required including util.h in several C files mostly due to OVS_NOT_REACHED and things like xmalloc. Signed-off-by: Terry Wilson <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
dkarhi · Jul 23, 2016 · ee89ea7 · ee89ea7
1 parent ab39371
commit ee89ea7
Show file tree

Hide file tree

Showing 141 changed files with 193 additions and 156 deletions.
diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
@@ -2,8 +2,10 @@ openvswitchincludedir = $(includedir)/openvswitch
 openvswitchinclude_HEADERS = \
 	include/openvswitch/compiler.h \
 	include/openvswitch/dynamic-string.h \
+	include/openvswitch/hmap.h \
 	include/openvswitch/flow.h \
 	include/openvswitch/geneve.h \
+	include/openvswitch/json.h \
 	include/openvswitch/list.h \
 	include/openvswitch/netdev.h \
 	include/openvswitch/match.h \
@@ -17,6 +19,7 @@ openvswitchinclude_HEADERS = \
 	include/openvswitch/ofp-prop.h \
 	include/openvswitch/ofp-util.h \
 	include/openvswitch/packets.h \
+	include/openvswitch/shash.h \
 	include/openvswitch/thread.h \
 	include/openvswitch/token-bucket.h \
 	include/openvswitch/tun-metadata.h \

diff --git a/lib/hmap.h → include/openvswitch/hmap.h b/lib/hmap.h → include/openvswitch/hmap.h
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 #include <stdlib.h>
-#include "util.h"
+#include "openvswitch/util.h"
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/lib/json.h → include/openvswitch/json.h b/lib/json.h → include/openvswitch/json.h
@@ -30,7 +30,8 @@
  *        "should" be unique).
  */
 
-#include "shash.h"
+#include <stdio.h>
+#include "openvswitch/shash.h"
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/lib/shash.h → include/openvswitch/shash.h b/lib/shash.h → include/openvswitch/shash.h
@@ -17,8 +17,8 @@
 #ifndef SHASH_H
 #define SHASH_H 1
 
-#include "hmap.h"
-#include "util.h"
+#include "openvswitch/hmap.h"
+#include "openvswitch/util.h"
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/lib/automake.mk b/lib/automake.mk
@@ -94,15 +94,13 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/hindex.c \
 	lib/hindex.h \
 	lib/hmap.c \
-	lib/hmap.h \
 	lib/hmapx.c \
 	lib/hmapx.h \
 	lib/id-pool.c \
 	lib/id-pool.h \
 	lib/jhash.c \
 	lib/jhash.h \
 	lib/json.c \
-	lib/json.h \
 	lib/jsonrpc.c \
 	lib/jsonrpc.h \
 	lib/lacp.c \
@@ -219,7 +217,6 @@ lib_libopenvswitch_la_SOURCES = \
 	lib/sha1.c \
 	lib/sha1.h \
 	lib/shash.c \
-	lib/shash.h \
 	lib/simap.c \
 	lib/simap.h \
 	lib/smap.c \

diff --git a/lib/bfd.c b/lib/bfd.c
@@ -29,7 +29,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "hash.h"
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "openvswitch/list.h"
 #include "netdev.h"
 #include "odp-util.h"

diff --git a/lib/bundle.c b/lib/bundle.c
@@ -31,6 +31,7 @@
 #include "openvswitch/ofp-util.h"
 #include "openvswitch/ofpbuf.h"
 #include "openvswitch/vlog.h"
+#include "util.h"
 
 VLOG_DEFINE_THIS_MODULE(bundle);
 

diff --git a/lib/cfm.c b/lib/cfm.c
@@ -27,7 +27,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "flow.h"
 #include "hash.h"
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "netdev.h"
 #include "ovs-atomic.h"
 #include "packets.h"
@@ -38,6 +38,7 @@
 #include "timeval.h"
 #include "unixctl.h"
 #include "openvswitch/vlog.h"
+#include "util.h"
 
 VLOG_DEFINE_THIS_MODULE(cfm);
 

diff --git a/lib/cfm.h b/lib/cfm.h
@@ -18,7 +18,7 @@
 
 #include <stdint.h>
 
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "openvswitch/types.h"
 #include "packets.h"
 

diff --git a/lib/db-ctl-base.c b/lib/db-ctl-base.c
@@ -28,12 +28,12 @@
 #include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "hash.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "openvswitch/vlog.h"
 #include "ovsdb-data.h"
 #include "ovsdb-idl.h"
 #include "ovsdb-idl-provider.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "sset.h"
 #include "string.h"
 #include "table.h"

diff --git a/lib/db-ctl-base.h b/lib/db-ctl-base.h
@@ -19,7 +19,7 @@
 
 #include "compiler.h"
 #include "openvswitch/dynamic-string.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 
 struct ctl_context;
 struct option;

diff --git a/lib/dpctl.c b/lib/dpctl.c
@@ -42,7 +42,7 @@
 #include "openvswitch/ofpbuf.h"
 #include "ovs-numa.h"
 #include "packets.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "simap.h"
 #include "smap.h"
 #include "sset.h"

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
@@ -62,7 +62,7 @@
 #include "pvector.h"
 #include "random.h"
 #include "seq.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "sset.h"
 #include "timeval.h"
 #include "tnl-neigh-cache.h"

diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c
@@ -49,7 +49,7 @@
 #include "packets.h"
 #include "poll-loop.h"
 #include "random.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "sset.h"
 #include "timeval.h"
 #include "unaligned.h"

diff --git a/lib/dpif.c b/lib/dpif.c
@@ -40,7 +40,7 @@
 #include "poll-loop.h"
 #include "route-table.h"
 #include "seq.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "sset.h"
 #include "timeval.h"
 #include "tnl-neigh-cache.h"

diff --git a/lib/fat-rwlock.c b/lib/fat-rwlock.c
@@ -20,7 +20,7 @@
 
 #include <errno.h>
 
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "openvswitch/list.h"
 #include "ovs-thread.h"
 #include "random.h"

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include "ovs-thread.h"
 #include "poll-loop.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "sset.h"
 #include "signals.h"
 #include "socket-util.h"

diff --git a/lib/flow.c b/lib/flow.c
@@ -39,6 +39,7 @@
 #include "odp-util.h"
 #include "random.h"
 #include "unaligned.h"
+#include "util.h"
 
 COVERAGE_DEFINE(flow_extract);
 COVERAGE_DEFINE(miniflow_malloc);

diff --git a/lib/hmap.c b/lib/hmap.c
@@ -15,7 +15,7 @@
  */
 
 #include <config.h>
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include <stdint.h>
 #include <string.h>
 #include "coverage.h"

diff --git a/lib/hmapx.h b/lib/hmapx.h
@@ -17,7 +17,7 @@
 #ifndef HMAPX_H
 #define HMAPX_H
 
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 
 struct hmapx_node {
     struct hmap_node hmap_node;

diff --git a/lib/id-pool.c b/lib/id-pool.c
@@ -17,7 +17,7 @@
 
 #include <config.h>
 #include "id-pool.h"
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "hash.h"
 
 struct id_node {

diff --git a/lib/json.c b/lib/json.c
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include "json.h"
+#include "openvswitch/json.h"
 
 #include <ctype.h>
 #include <errno.h>
@@ -26,7 +26,7 @@
 
 #include "openvswitch/dynamic-string.h"
 #include "hash.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "unicode.h"
 #include "util.h"
 

diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c
@@ -23,7 +23,7 @@
 #include "byteq.h"
 #include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "openvswitch/list.h"
 #include "openvswitch/ofpbuf.h"
 #include "ovs-thread.h"

diff --git a/lib/lacp.c b/lib/lacp.c
@@ -21,17 +21,18 @@
 #include "connectivity.h"
 #include "openvswitch/dynamic-string.h"
 #include "hash.h"
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "dp-packet.h"
 #include "ovs-atomic.h"
 #include "packets.h"
 #include "poll-loop.h"
 #include "seq.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "timer.h"
 #include "timeval.h"
 #include "unixctl.h"
 #include "openvswitch/vlog.h"
+#include "util.h"
 
 VLOG_DEFINE_THIS_MODULE(lacp);
 

diff --git a/lib/learning-switch.c b/lib/learning-switch.c
@@ -27,7 +27,7 @@
 #include "classifier.h"
 #include "dp-packet.h"
 #include "flow.h"
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "mac-learning.h"
 #include "openflow/openflow.h"
 #include "openvswitch/ofp-actions.h"
@@ -41,7 +41,7 @@
 #include "openvswitch/vlog.h"
 #include "poll-loop.h"
 #include "rconn.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "simap.h"
 #include "timeval.h"
 

diff --git a/lib/lockfile.c b/lib/lockfile.c
@@ -26,7 +26,7 @@
 
 #include "coverage.h"
 #include "hash.h"
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "ovs-thread.h"
 #include "timeval.h"
 #include "util.h"

diff --git a/lib/mac-learning.h b/lib/mac-learning.h
@@ -19,7 +19,7 @@
 
 #include <time.h>
 #include "heap.h"
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "openvswitch/list.h"
 #include "ovs-atomic.h"
 #include "ovs-thread.h"

diff --git a/lib/mcast-snooping.h b/lib/mcast-snooping.h
@@ -21,7 +21,7 @@
 
 #include <time.h>
 #include "dp-packet.h"
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "openvswitch/list.h"
 #include "ovs-atomic.h"
 #include "ovs-thread.h"

diff --git a/lib/meta-flow.c b/lib/meta-flow.c
@@ -30,7 +30,7 @@
 #include "ovs-thread.h"
 #include "packets.h"
 #include "random.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "socket-util.h"
 #include "tun-metadata.h"
 #include "unaligned.h"

diff --git a/lib/multipath.c b/lib/multipath.c
@@ -29,6 +29,7 @@
 #include "openvswitch/ofp-errors.h"
 #include "openvswitch/ofp-util.h"
 #include "packets.h"
+#include "util.h"
 
 /* Checks that 'mp' is valid on flow.  Returns 0 if it is valid, otherwise an
  * OFPERR_*. */

diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c
@@ -57,7 +57,7 @@
 #include "ovs-thread.h"
 #include "packets.h"
 #include "poll-loop.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "socket-util.h"
 #include "svec.h"
 #include "util.h"

diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
@@ -48,7 +48,7 @@
 #include "ovs-thread.h"
 #include "ovs-rcu.h"
 #include "packets.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "smap.h"
 #include "sset.h"
 #include "unaligned.h"

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
@@ -36,7 +36,7 @@
 #include "packets.h"
 #include "pcap-file.h"
 #include "poll-loop.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "sset.h"
 #include "stream.h"
 #include "unaligned.h"

diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
@@ -55,7 +55,7 @@
 #include "openvswitch/dynamic-string.h"
 #include "fatal-signal.h"
 #include "hash.h"
-#include "hmap.h"
+#include "openvswitch/hmap.h"
 #include "netdev-provider.h"
 #include "netdev-vport.h"
 #include "netlink-notifier.h"
@@ -67,12 +67,13 @@
 #include "packets.h"
 #include "poll-loop.h"
 #include "rtnetlink.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "socket-util.h"
 #include "sset.h"
 #include "timer.h"
 #include "unaligned.h"
 #include "openvswitch/vlog.h"
+#include "util.h"
 
 VLOG_DEFINE_THIS_MODULE(netdev_linux);
 

diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h
@@ -25,7 +25,7 @@
 #include "ovs-numa.h"
 #include "packets.h"
 #include "seq.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
 #include "smap.h"
 
 #ifdef  __cplusplus