summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2010-06-28 02:49:46 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-06-28 22:20:45 -0700
commit0da2a6d08cc8fc2315742d010c8a8cab38ef75bb (patch)
treeeed93284ad3826ac7401c9f9540b6afe9a68c2cc
parent2c5c3cedc096c36ef9d004ffa0cdb5324d2915e6 (diff)
Move rpc to top-level
Signed-off-by: Vijay Bellur <vijay@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac12
-rw-r--r--rpc/Makefile.am (renamed from xlators/protocol/rpc/Makefile.am)0
-rw-r--r--rpc/rpc-lib/Makefile.am (renamed from xlators/protocol/rpc/rpc-lib/Makefile.am)0
-rw-r--r--rpc/rpc-lib/src/Makefile.am (renamed from xlators/protocol/rpc/rpc-lib/src/Makefile.am)0
-rw-r--r--rpc/rpc-lib/src/auth-glusterfs.c (renamed from xlators/protocol/rpc/rpc-lib/src/auth-glusterfs.c)0
-rw-r--r--rpc/rpc-lib/src/auth-null.c (renamed from xlators/protocol/rpc/rpc-lib/src/auth-null.c)0
-rw-r--r--rpc/rpc-lib/src/auth-unix.c (renamed from xlators/protocol/rpc/rpc-lib/src/auth-unix.c)0
-rw-r--r--rpc/rpc-lib/src/rpc-clnt.c (renamed from xlators/protocol/rpc/rpc-lib/src/rpc-clnt.c)0
-rw-r--r--rpc/rpc-lib/src/rpc-clnt.h (renamed from xlators/protocol/rpc/rpc-lib/src/rpc-clnt.h)0
-rw-r--r--rpc/rpc-lib/src/rpc-transport.c (renamed from xlators/protocol/rpc/rpc-lib/src/rpc-transport.c)0
-rw-r--r--rpc/rpc-lib/src/rpc-transport.h (renamed from xlators/protocol/rpc/rpc-lib/src/rpc-transport.h)0
-rw-r--r--rpc/rpc-lib/src/rpcsvc-auth.c (renamed from xlators/protocol/rpc/rpc-lib/src/rpcsvc-auth.c)0
-rw-r--r--rpc/rpc-lib/src/rpcsvc-common.h (renamed from xlators/protocol/rpc/rpc-lib/src/rpcsvc-common.h)0
-rw-r--r--rpc/rpc-lib/src/rpcsvc.c (renamed from xlators/protocol/rpc/rpc-lib/src/rpcsvc.c)0
-rw-r--r--rpc/rpc-lib/src/rpcsvc.h (renamed from xlators/protocol/rpc/rpc-lib/src/rpcsvc.h)0
-rw-r--r--rpc/rpc-lib/src/xdr-common.h (renamed from xlators/protocol/rpc/rpc-lib/src/xdr-common.h)0
-rw-r--r--rpc/rpc-lib/src/xdr-rpc.c (renamed from xlators/protocol/rpc/rpc-lib/src/xdr-rpc.c)0
-rw-r--r--rpc/rpc-lib/src/xdr-rpc.h (renamed from xlators/protocol/rpc/rpc-lib/src/xdr-rpc.h)0
-rw-r--r--rpc/rpc-lib/src/xdr-rpcclnt.c (renamed from xlators/protocol/rpc/rpc-lib/src/xdr-rpcclnt.c)0
-rw-r--r--rpc/rpc-lib/src/xdr-rpcclnt.h (renamed from xlators/protocol/rpc/rpc-lib/src/xdr-rpcclnt.h)0
-rw-r--r--rpc/rpc-transport/Makefile.am (renamed from xlators/protocol/rpc/rpc-transport/Makefile.am)0
-rw-r--r--rpc/rpc-transport/socket/Makefile.am (renamed from xlators/protocol/rpc/rpc-transport/socket/Makefile.am)0
-rw-r--r--rpc/rpc-transport/socket/src/Makefile.am (renamed from xlators/protocol/rpc/rpc-transport/socket/src/Makefile.am)2
-rw-r--r--rpc/rpc-transport/socket/src/name.c (renamed from xlators/protocol/rpc/rpc-transport/socket/src/name.c)0
-rw-r--r--rpc/rpc-transport/socket/src/name.h (renamed from xlators/protocol/rpc/rpc-transport/socket/src/name.h)0
-rw-r--r--rpc/rpc-transport/socket/src/socket.c (renamed from xlators/protocol/rpc/rpc-transport/socket/src/socket.c)0
-rw-r--r--rpc/rpc-transport/socket/src/socket.h (renamed from xlators/protocol/rpc/rpc-transport/socket/src/socket.h)0
-rw-r--r--xlators/protocol/Makefile.am2
-rw-r--r--xlators/protocol/client/src/Makefile.am4
-rw-r--r--xlators/protocol/lib/src/Makefile.am2
-rw-r--r--xlators/protocol/server/src/Makefile.am4
32 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 9f93f99..ce0adb8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
EXTRA_DIST = autogen.sh COPYING INSTALL README AUTHORS THANKS NEWS glusterfs.spec
-SUBDIRS = argp-standalone libglusterfs xlators glusterfsd $(FUSERMOUNT_SUBDIR) doc extras contrib
+SUBDIRS = argp-standalone libglusterfs rpc xlators glusterfsd $(FUSERMOUNT_SUBDIR) doc extras contrib
CLEANFILES =
diff --git a/configure.ac b/configure.ac
index ffe87e8..fe88d5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,12 @@ AC_CONFIG_FILES([Makefile
libglusterfs/src/Makefile
glusterfsd/Makefile
glusterfsd/src/Makefile
+ rpc/Makefile
+ rpc/rpc-lib/Makefile
+ rpc/rpc-lib/src/Makefile
+ rpc/rpc-transport/Makefile
+ rpc/rpc-transport/socket/Makefile
+ rpc/rpc-transport/socket/src/Makefile
xlators/Makefile
xlators/mount/Makefile
xlators/mount/fuse/Makefile
@@ -84,12 +90,6 @@ AC_CONFIG_FILES([Makefile
xlators/protocol/auth/addr/src/Makefile
xlators/protocol/auth/login/Makefile
xlators/protocol/auth/login/src/Makefile
- xlators/protocol/rpc/Makefile
- xlators/protocol/rpc/rpc-lib/Makefile
- xlators/protocol/rpc/rpc-lib/src/Makefile
- xlators/protocol/rpc/rpc-transport/Makefile
- xlators/protocol/rpc/rpc-transport/socket/Makefile
- xlators/protocol/rpc/rpc-transport/socket/src/Makefile
xlators/protocol/client/Makefile
xlators/protocol/client/src/Makefile
xlators/protocol/server/Makefile
diff --git a/xlators/protocol/rpc/Makefile.am b/rpc/Makefile.am
index bd435fa..bd435fa 100644
--- a/xlators/protocol/rpc/Makefile.am
+++ b/rpc/Makefile.am
diff --git a/xlators/protocol/rpc/rpc-lib/Makefile.am b/rpc/rpc-lib/Makefile.am
index af437a6..af437a6 100644
--- a/xlators/protocol/rpc/rpc-lib/Makefile.am
+++ b/rpc/rpc-lib/Makefile.am
diff --git a/xlators/protocol/rpc/rpc-lib/src/Makefile.am b/rpc/rpc-lib/src/Makefile.am
index 4df8888..4df8888 100644
--- a/xlators/protocol/rpc/rpc-lib/src/Makefile.am
+++ b/rpc/rpc-lib/src/Makefile.am
diff --git a/xlators/protocol/rpc/rpc-lib/src/auth-glusterfs.c b/rpc/rpc-lib/src/auth-glusterfs.c
index e248bf1..e248bf1 100644
--- a/xlators/protocol/rpc/rpc-lib/src/auth-glusterfs.c
+++ b/rpc/rpc-lib/src/auth-glusterfs.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/auth-null.c b/rpc/rpc-lib/src/auth-null.c
index a2581a1..a2581a1 100644
--- a/xlators/protocol/rpc/rpc-lib/src/auth-null.c
+++ b/rpc/rpc-lib/src/auth-null.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/auth-unix.c b/rpc/rpc-lib/src/auth-unix.c
index aed3c1f..aed3c1f 100644
--- a/xlators/protocol/rpc/rpc-lib/src/auth-unix.c
+++ b/rpc/rpc-lib/src/auth-unix.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index 84fdb9b..84fdb9b 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpc-clnt.h b/rpc/rpc-lib/src/rpc-clnt.h
index efc256c..efc256c 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpc-clnt.h
+++ b/rpc/rpc-lib/src/rpc-clnt.h
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index 82ea9a7..82ea9a7 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h
index b3c7985..b3c7985 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpc-transport.h
+++ b/rpc/rpc-lib/src/rpc-transport.h
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpcsvc-auth.c b/rpc/rpc-lib/src/rpcsvc-auth.c
index fa039c3..fa039c3 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpcsvc-auth.c
+++ b/rpc/rpc-lib/src/rpcsvc-auth.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpcsvc-common.h b/rpc/rpc-lib/src/rpcsvc-common.h
index 0b9d84c..0b9d84c 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpcsvc-common.h
+++ b/rpc/rpc-lib/src/rpcsvc-common.h
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index e07cb8e..e07cb8e 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h
index 10dc326..10dc326 100644
--- a/xlators/protocol/rpc/rpc-lib/src/rpcsvc.h
+++ b/rpc/rpc-lib/src/rpcsvc.h
diff --git a/xlators/protocol/rpc/rpc-lib/src/xdr-common.h b/rpc/rpc-lib/src/xdr-common.h
index 0c9ffb2..0c9ffb2 100644
--- a/xlators/protocol/rpc/rpc-lib/src/xdr-common.h
+++ b/rpc/rpc-lib/src/xdr-common.h
diff --git a/xlators/protocol/rpc/rpc-lib/src/xdr-rpc.c b/rpc/rpc-lib/src/xdr-rpc.c
index 088bddb..088bddb 100644
--- a/xlators/protocol/rpc/rpc-lib/src/xdr-rpc.c
+++ b/rpc/rpc-lib/src/xdr-rpc.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/xdr-rpc.h b/rpc/rpc-lib/src/xdr-rpc.h
index 4c0ee69..4c0ee69 100644
--- a/xlators/protocol/rpc/rpc-lib/src/xdr-rpc.h
+++ b/rpc/rpc-lib/src/xdr-rpc.h
diff --git a/xlators/protocol/rpc/rpc-lib/src/xdr-rpcclnt.c b/rpc/rpc-lib/src/xdr-rpcclnt.c
index 98676ae..98676ae 100644
--- a/xlators/protocol/rpc/rpc-lib/src/xdr-rpcclnt.c
+++ b/rpc/rpc-lib/src/xdr-rpcclnt.c
diff --git a/xlators/protocol/rpc/rpc-lib/src/xdr-rpcclnt.h b/rpc/rpc-lib/src/xdr-rpcclnt.h
index 37c3046..37c3046 100644
--- a/xlators/protocol/rpc/rpc-lib/src/xdr-rpcclnt.h
+++ b/rpc/rpc-lib/src/xdr-rpcclnt.h
diff --git a/xlators/protocol/rpc/rpc-transport/Makefile.am b/rpc/rpc-transport/Makefile.am
index 7dd9f02..7dd9f02 100644
--- a/xlators/protocol/rpc/rpc-transport/Makefile.am
+++ b/rpc/rpc-transport/Makefile.am
diff --git a/xlators/protocol/rpc/rpc-transport/socket/Makefile.am b/rpc/rpc-transport/socket/Makefile.am
index f963eff..f963eff 100644
--- a/xlators/protocol/rpc/rpc-transport/socket/Makefile.am
+++ b/rpc/rpc-transport/socket/Makefile.am
diff --git a/xlators/protocol/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am
index 325a58b..46a3e12 100644
--- a/xlators/protocol/rpc/rpc-transport/socket/src/Makefile.am
+++ b/rpc/rpc-transport/socket/src/Makefile.am
@@ -9,7 +9,7 @@ socket_la_SOURCES = socket.c name.c
socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
- -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/protocol/rpc/rpc-lib/src/ \
+ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \
-I$(top_srcdir)/xlators/protocol/lib/src/ -shared -nostartfiles $(GF_CFLAGS)
CLEANFILES = *~
diff --git a/xlators/protocol/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c
index 763fa3d..763fa3d 100644
--- a/xlators/protocol/rpc/rpc-transport/socket/src/name.c
+++ b/rpc/rpc-transport/socket/src/name.c
diff --git a/xlators/protocol/rpc/rpc-transport/socket/src/name.h b/rpc/rpc-transport/socket/src/name.h
index 6a89d38..6a89d38 100644
--- a/xlators/protocol/rpc/rpc-transport/socket/src/name.h
+++ b/rpc/rpc-transport/socket/src/name.h
diff --git a/xlators/protocol/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 4ca7121..4ca7121 100644
--- a/xlators/protocol/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
diff --git a/xlators/protocol/rpc/rpc-transport/socket/src/socket.h b/rpc/rpc-transport/socket/src/socket.h
index aa31ee2..aa31ee2 100644
--- a/xlators/protocol/rpc/rpc-transport/socket/src/socket.h
+++ b/rpc/rpc-transport/socket/src/socket.h
diff --git a/xlators/protocol/Makefile.am b/xlators/protocol/Makefile.am
index b38506d..17c9a83 100644
--- a/xlators/protocol/Makefile.am
+++ b/xlators/protocol/Makefile.am
@@ -1 +1 @@
-SUBDIRS = lib auth legacy rpc client server
+SUBDIRS = lib auth legacy client server
diff --git a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am
index 1051368..7811e08 100644
--- a/xlators/protocol/client/src/Makefile.am
+++ b/xlators/protocol/client/src/Makefile.am
@@ -5,7 +5,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
client_la_LDFLAGS = -module -avoidversion
client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
- $(top_builddir)/xlators/protocol/rpc/rpc-lib/src/libgfrpc.la \
+ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
$(top_builddir)/xlators/protocol/lib/src/libgfproto1.la
client_la_SOURCES = client.c client-helpers.c client3_1-fops.c client-handshake.c
@@ -13,4 +13,4 @@ noinst_HEADERS = client.h client-mem-types.h
AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) \
- -I$(top_srcdir)/xlators/protocol/lib/src -I$(top_srcdir)/xlators/protocol/rpc/rpc-lib/src/
+ -I$(top_srcdir)/xlators/protocol/lib/src -I$(top_srcdir)/rpc/rpc-lib/src/
diff --git a/xlators/protocol/lib/src/Makefile.am b/xlators/protocol/lib/src/Makefile.am
index 98cf44d..be59aa6 100644
--- a/xlators/protocol/lib/src/Makefile.am
+++ b/xlators/protocol/lib/src/Makefile.am
@@ -6,7 +6,7 @@ libgfproto1_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SO
-D$(GF_HOST_OS) -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\" \
-DTRANSPORTDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/transport\" \
-I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/libglusterfs/src/ \
- -I$(top_srcdir)/xlators/protocol/rpc/rpc-lib/src/
+ -I$(top_srcdir)/rpc/rpc-lib/src/
libgfproto1_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
diff --git a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am
index 5660679..be304bd 100644
--- a/xlators/protocol/server/src/Makefile.am
+++ b/xlators/protocol/server/src/Makefile.am
@@ -4,7 +4,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
server_la_LDFLAGS = -module -avoidversion
server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
- $(top_builddir)/xlators/protocol/rpc/rpc-lib/src/libgfrpc.la \
+ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
$(top_builddir)/xlators/protocol/lib/src/libgfproto1.la
server_la_SOURCES = server.c server-resolve.c server-helpers.c \
@@ -16,7 +16,7 @@ AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall \
-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles \
-DCONFDIR=\"$(sysconfdir)/glusterfs\" -D$(GF_HOST_OS) \
$(GF_CFLAGS) -I$(top_srcdir)/xlators/protocol/lib/src \
- -I$(top_srcdir)/xlators/protocol/rpc/rpc-lib/src/ \
+ -I$(top_srcdir)/rpc/rpc-lib/src/ \
-I$(top_srcdir)/contrib/md5/
CLEANFILES = *~