From 20ef211cfa5b5fcc437484a879fdc5d4c66bbaf5 Mon Sep 17 00:00:00 2001 From: ShyamsundarR Date: Thu, 29 Nov 2018 14:08:06 -0500 Subject: libglusterfs: Move devel headers under glusterfs directory libglusterfs devel package headers are referenced in code using include semantics for a program, this while it works can be better especially when dealing with out of tree xlator builds or in general out of tree devel package usage. Towards this, the following changes are done, - moved all devel headers under a glusterfs directory - Included these headers using system header notation <> in all code outside of libglusterfs - Included these headers using own program notation "" within libglusterfs This change although big, is just moving around the headers and making it correct when including these headers from other sources. This helps us correctly include libglusterfs includes without namespace conflicts. Change-Id: Id2a98854e671a7ee5d73be44da5ba1a74252423b Updates: bz#1193929 Signed-off-by: ShyamsundarR --- xlators/debug/delay-gen/src/delay-gen-mem-types.h | 2 +- xlators/debug/delay-gen/src/delay-gen-messages.h | 2 +- xlators/debug/delay-gen/src/delay-gen.h | 6 +++--- xlators/debug/error-gen/src/error-gen-mem-types.h | 2 +- xlators/debug/error-gen/src/error-gen.c | 6 +++--- xlators/debug/io-stats/src/io-stats-mem-types.h | 2 +- xlators/debug/io-stats/src/io-stats.c | 18 +++++++++--------- xlators/debug/sink/src/sink.c | 4 ++-- xlators/debug/trace/src/trace-mem-types.h | 2 +- xlators/debug/trace/src/trace.h | 16 ++++++++-------- 10 files changed, 30 insertions(+), 30 deletions(-) (limited to 'xlators/debug') diff --git a/xlators/debug/delay-gen/src/delay-gen-mem-types.h b/xlators/debug/delay-gen/src/delay-gen-mem-types.h index 63a15a70da3..c89a9217193 100644 --- a/xlators/debug/delay-gen/src/delay-gen-mem-types.h +++ b/xlators/debug/delay-gen/src/delay-gen-mem-types.h @@ -11,7 +11,7 @@ #ifndef __DELAY_GEN_MEM_TYPES_H__ #define __DELAY_GEN_MEM_TYPES_H__ -#include "mem-types.h" +#include enum gf_delay_gen_mem_types_ { gf_delay_gen_mt_dg_t = gf_common_mt_end + 1, diff --git a/xlators/debug/delay-gen/src/delay-gen-messages.h b/xlators/debug/delay-gen/src/delay-gen-messages.h index a9046ca14bf..bc98cec2885 100644 --- a/xlators/debug/delay-gen/src/delay-gen-messages.h +++ b/xlators/debug/delay-gen/src/delay-gen-messages.h @@ -11,7 +11,7 @@ #ifndef __DELAY_GEN_MESSAGES_H__ #define __DELAY_GEN_MESSAGES_H__ -#include "glfs-message-id.h" +#include /* To add new message IDs, append new identifiers at the end of the list. * diff --git a/xlators/debug/delay-gen/src/delay-gen.h b/xlators/debug/delay-gen/src/delay-gen.h index 5e4d179f0b4..afa95e5eb2d 100644 --- a/xlators/debug/delay-gen/src/delay-gen.h +++ b/xlators/debug/delay-gen/src/delay-gen.h @@ -13,9 +13,9 @@ #include "delay-gen-mem-types.h" #include "delay-gen-messages.h" -#include "glusterfs.h" -#include "xlator.h" -#include "defaults.h" +#include +#include +#include typedef struct { int enable[GF_FOP_MAXVALUE]; diff --git a/xlators/debug/error-gen/src/error-gen-mem-types.h b/xlators/debug/error-gen/src/error-gen-mem-types.h index 2facd6b27cb..b9b713af8fc 100644 --- a/xlators/debug/error-gen/src/error-gen-mem-types.h +++ b/xlators/debug/error-gen/src/error-gen-mem-types.h @@ -11,7 +11,7 @@ #ifndef __ERROR_GEN_MEM_TYPES_H__ #define __ERROR_GEN_MEM_TYPES_H__ -#include "mem-types.h" +#include enum gf_error_gen_mem_types_ { gf_error_gen_mt_eg_t = gf_common_mt_end + 1, diff --git a/xlators/debug/error-gen/src/error-gen.c b/xlators/debug/error-gen/src/error-gen.c index c6595b4c0e4..3d271b2ef21 100644 --- a/xlators/debug/error-gen/src/error-gen.c +++ b/xlators/debug/error-gen/src/error-gen.c @@ -7,10 +7,10 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "xlator.h" +#include #include "error-gen.h" -#include "statedump.h" -#include "defaults.h" +#include +#include /* * The user can specify an error probability as a float percentage, but we diff --git a/xlators/debug/io-stats/src/io-stats-mem-types.h b/xlators/debug/io-stats/src/io-stats-mem-types.h index bc25fd2ca4e..51d38d8b97c 100644 --- a/xlators/debug/io-stats/src/io-stats-mem-types.h +++ b/xlators/debug/io-stats/src/io-stats-mem-types.h @@ -11,7 +11,7 @@ #ifndef __IO_STATS_MEM_TYPES_H__ #define __IO_STATS_MEM_TYPES_H__ -#include "mem-types.h" +#include extern const char *__progname; diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c index 249ef5093b4..71eae7bc7ed 100644 --- a/xlators/debug/io-stats/src/io-stats.c +++ b/xlators/debug/io-stats/src/io-stats.c @@ -7,8 +7,8 @@ later), or the GNU General Public License, version 2 (GPLv2), in all cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "syscall.h" +#include +#include /** * xlators/debug/io_stats : @@ -28,18 +28,18 @@ #include #include -#include "glusterfs.h" -#include "xlator.h" +#include +#include #include "io-stats-mem-types.h" #include -#include "defaults.h" -#include "logging.h" +#include +#include #include "cli1-xdr.h" -#include "statedump.h" -#include "syncop.h" +#include +#include #include #include -#include "upcall-utils.h" +#include #define MAX_LIST_MEMBERS 100 #define DEFAULT_PWD_BUF_SZ 16384 diff --git a/xlators/debug/sink/src/sink.c b/xlators/debug/sink/src/sink.c index fbbdd3a4847..965efd811ae 100644 --- a/xlators/debug/sink/src/sink.c +++ b/xlators/debug/sink/src/sink.c @@ -8,8 +8,8 @@ cases as published by the Free Software Foundation. */ -#include "xlator.h" -#include "defaults.h" +#include +#include int32_t init(xlator_t *this) diff --git a/xlators/debug/trace/src/trace-mem-types.h b/xlators/debug/trace/src/trace-mem-types.h index cf05a77b9f1..18a7e0414a6 100644 --- a/xlators/debug/trace/src/trace-mem-types.h +++ b/xlators/debug/trace/src/trace-mem-types.h @@ -11,7 +11,7 @@ #ifndef __TRACE_MEM_TYPES_H__ #define __TRACE_MEM_TYPES_H__ -#include "mem-types.h" +#include enum gf_trace_mem_types_ { gf_trace_mt_trace_conf_t = gf_common_mt_end + 1, diff --git a/xlators/debug/trace/src/trace.h b/xlators/debug/trace/src/trace.h index cd73e0f34ed..b16304799da 100644 --- a/xlators/debug/trace/src/trace.h +++ b/xlators/debug/trace/src/trace.h @@ -10,14 +10,14 @@ #include #include -#include "glusterfs.h" -#include "xlator.h" -#include "common-utils.h" -#include "event-history.h" -#include "logging.h" -#include "circ-buff.h" -#include "statedump.h" -#include "options.h" +#include +#include +#include +#include +#include +#include +#include +#include #define TRACE_DEFAULT_HISTORY_SIZE 1024 -- cgit