andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

structuring of protocol - 2

Browse Source 
* 'transports/' and 'auth/' moved to xlators/protocol/
* transport.{c,h}, authenticate.{c,h}, protocol.h moved to
    xlators/protocol/lib/src/

Signed-off-by: Amar Tumballi <amar@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
This commit is contained in:
Amar Tumballi 2010-05-04 00:36:24 +00:00 committed by Anand V. Avati
parent 7504b0e623
commit f75b763507
37 changed files with 77 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1,6 +1,6 @@
EXTRA_DIST = autogen.sh COPYING INSTALL README AUTHORS THANKS NEWS glusterfs.spec
SUBDIRS = argp-standalone libglusterfs xlators transport auth glusterfsd $(FUSERMOUNT_SUBDIR) doc extras
SUBDIRS = argp-standalone libglusterfs xlators glusterfsd $(FUSERMOUNT_SUBDIR) doc extras
CLEANFILES =

22
configure.ac
View File

@ -65,10 +65,22 @@ AC_CONFIG_FILES([Makefile
xlators/debug/io-stats/Makefile
xlators/debug/io-stats/src/Makefile
xlators/protocol/Makefile
xlators/protocol/lib/Makefile
xlators/protocol/lib/src/Makefile
xlators/protocol/transport/Makefile
xlators/protocol/transport/socket/Makefile
xlators/protocol/transport/socket/src/Makefile
xlators/protocol/transport/ib-verbs/Makefile
xlators/protocol/transport/ib-verbs/src/Makefile
xlators/protocol/client/Makefile
xlators/protocol/client/src/Makefile
xlators/protocol/server/Makefile
xlators/protocol/server/src/Makefile
xlators/protocol/auth/Makefile
xlators/protocol/auth/addr/Makefile
xlators/protocol/auth/addr/src/Makefile
xlators/protocol/auth/login/Makefile
xlators/protocol/auth/login/src/Makefile
xlators/features/Makefile
xlators/features/locks/Makefile
xlators/features/locks/src/Makefile
@ -81,16 +93,6 @@ AC_CONFIG_FILES([Makefile
xlators/encryption/Makefile
xlators/encryption/rot-13/Makefile
xlators/encryption/rot-13/src/Makefile
transport/Makefile
transport/socket/Makefile
transport/socket/src/Makefile
transport/ib-verbs/Makefile
transport/ib-verbs/src/Makefile
auth/Makefile
auth/addr/Makefile
auth/addr/src/Makefile
auth/login/Makefile
auth/login/src/Makefile
doc/Makefile
doc/examples/Makefile
doc/hacker-guide/Makefile

6
libglusterfs/src/Makefile.am
View File

@ -1,14 +1,14 @@
libglusterfs_la_CFLAGS = -fPIC -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS)
libglusterfs_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE -DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\" -DSCHEDULERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler\" -DTRANSPORTDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/transport\" -D$(GF_HOST_OS) -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\" -I$(CONTRIBDIR)/rbtree
libglusterfs_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE -DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\" -D$(GF_HOST_OS) -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\" -I$(CONTRIBDIR)/rbtree -DSCHEDULERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler\"
libglusterfs_la_LIBADD = @LEXLIB@
lib_LTLIBRARIES = libglusterfs.la
libglusterfs_la_SOURCES = dict.c spec.lex.c y.tab.c xlator.c logging.c hashfn.c defaults.c scheduler.c common-utils.c transport.c timer.c inode.c call-stub.c compat.c authenticate.c fd.c compat-errno.c event.c mem-pool.c gf-dirent.c syscall.c iobuf.c globals.c statedump.c stack.c checksum.c md5.c $(CONTRIBDIR)/rbtree/rb.c rbthash.c latency.c
libglusterfs_la_SOURCES = dict.c spec.lex.c y.tab.c xlator.c logging.c hashfn.c defaults.c scheduler.c common-utils.c timer.c inode.c call-stub.c compat.c fd.c compat-errno.c event.c mem-pool.c gf-dirent.c syscall.c iobuf.c globals.c statedump.c stack.c checksum.c md5.c $(CONTRIBDIR)/rbtree/rb.c rbthash.c latency.c
noinst_HEADERS = common-utils.h defaults.h dict.h glusterfs.h hashfn.h logging.h protocol.h scheduler.h xlator.h transport.h stack.h timer.h list.h inode.h call-stub.h compat.h authenticate.h fd.h revision.h compat-errno.h event.h mem-pool.h byte-order.h gf-dirent.h locking.h syscall.h iobuf.h globals.h statedump.h checksum.h md5.h $(CONTRIBDIR)/rbtree/rb.h rbthash.h iatt.h latency.h
noinst_HEADERS = common-utils.h defaults.h dict.h glusterfs.h hashfn.h logging.h scheduler.h xlator.h stack.h timer.h list.h inode.h call-stub.h compat.h fd.h revision.h compat-errno.h event.h mem-pool.h byte-order.h gf-dirent.h locking.h syscall.h iobuf.h globals.h statedump.h checksum.h md5.h $(CONTRIBDIR)/rbtree/rb.h rbthash.h iatt.h latency.h
EXTRA_DIST = spec.l spec.y

15
transport/ib-verbs/src/Makefile.am
View File

@ -1,15 +0,0 @@
noinst_HEADERS = ib-verbs.h name.h
transport_LTLIBRARIES = ib-verbs.la
transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport
ib_verbs_la_LDFLAGS = -module -avoidversion
ib_verbs_la_SOURCES = ib-verbs.c name.c
ib_verbs_la_LIBADD = -libverbs $(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)/transport/ib-verbs \
-shared -nostartfiles $(GF_CFLAGS)
CLEANFILES = *~

1
xlators/nfs/lib/src/rpcsvc.h
View File

@ -27,7 +27,6 @@
#endif
#include "event.h"
#include "transport.h"
#include "logging.h"
#include "dict.h"
#include "mem-pool.h"

2
xlators/protocol/Makefile.am
View File

@ -1,3 +1,3 @@
SUBDIRS = client server
SUBDIRS = lib transport client server auth
CLEANFILES =

0
auth/Makefile.am → xlators/protocol/auth/Makefile.am
View File

0
auth/addr/Makefile.am → xlators/protocol/auth/addr/Makefile.am
View File

6
auth/addr/src/Makefile.am → xlators/protocol/auth/addr/src/Makefile.am
View File

@ -4,9 +4,11 @@ authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
addr_la_LDFLAGS = -module -avoidversion
addr_la_SOURCES = addr.c
addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
$(top_builddir)/xlators/protocol/lib/src/libgfproto.la
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)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) \
-I$(top_srcdir)/xlators/protocol/lib/src
CLEANFILES =

0
auth/addr/src/addr.c → xlators/protocol/auth/addr/src/addr.c
View File

0
auth/login/Makefile.am → xlators/protocol/auth/login/Makefile.am
View File

6
auth/login/src/Makefile.am → xlators/protocol/auth/login/src/Makefile.am
View File

@ -4,10 +4,12 @@ authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth
login_la_LDFLAGS = -module -avoidversion
login_la_SOURCES = login.c
login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
$(top_builddir)/xlators/protocol/lib/src/libgfproto.la
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)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) \
-I$(top_srcdir)/xlators/protocol/lib/src
CLEANFILES =

0
auth/login/src/login.c → xlators/protocol/auth/login/src/login.c
View File

6
xlators/protocol/client/src/Makefile.am
View File

@ -5,12 +5,14 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
client_la_LDFLAGS = -module -avoidversion
client_la_SOURCES = client-protocol.c saved-frames.c
client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
$(top_builddir)/xlators/protocol/lib/src/libgfproto.la
noinst_HEADERS = client-protocol.h saved-frames.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)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) \
-I$(top_srcdir)/xlators/protocol/lib/src
CLEANFILES =

3
xlators/protocol/lib/Makefile.am Normal file
View File

@ -0,0 +1,3 @@
SUBDIRS = src
CLEANFILES =

15
xlators/protocol/lib/src/Makefile.am Normal file
View File

@ -0,0 +1,15 @@
libgfproto_la_CFLAGS = -fPIC -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS)
libgfproto_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE \
-D$(GF_HOST_OS) -DLIBDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/auth\" \
-DTRANSPORTDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/transport\" \
-I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/libglusterfs/src/
libgfproto_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
lib_LTLIBRARIES = libgfproto.la
libgfproto_la_SOURCES = transport.c authenticate.c
noinst_HEADERS = transport.h protocol.h authenticate.h

0
libglusterfs/src/authenticate.c → xlators/protocol/lib/src/authenticate.c
View File

0
libglusterfs/src/authenticate.h → xlators/protocol/lib/src/authenticate.h
View File

0
libglusterfs/src/protocol.h → xlators/protocol/lib/src/protocol.h
View File

0
libglusterfs/src/transport.c → xlators/protocol/lib/src/transport.c
View File

0
libglusterfs/src/transport.h → xlators/protocol/lib/src/transport.h
View File

5
xlators/protocol/server/src/Makefile.am
View File

@ -5,14 +5,15 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol
server_la_LDFLAGS = -module -avoidversion
server_la_SOURCES = server-protocol.c server-resolve.c server-helpers.c
server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
$(top_builddir)/xlators/protocol/lib/src/libgfproto.la
noinst_HEADERS = server-protocol.h server-helpers.h
AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles \
-DDATADIR=\"$(localstatedir)\" -DCONFDIR=\"$(sysconfdir)/glusterfs\" \
$(GF_CFLAGS)
$(GF_CFLAGS) -I$(top_srcdir)/xlators/protocol/lib/src
CLEANFILES =

0
transport/Makefile.am → xlators/protocol/transport/Makefile.am
View File

0
transport/ib-verbs/Makefile.am → xlators/protocol/transport/ib-verbs/Makefile.am
View File

19
xlators/protocol/transport/ib-verbs/src/Makefile.am Normal file
View File

@ -0,0 +1,19 @@
# TODO : need to change transportdir
transport_LTLIBRARIES = ib-verbs.la
transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport
ib_verbs_la_LDFLAGS = -module -avoidversion
ib_verbs_la_SOURCES = ib-verbs.c name.c
ib_verbs_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
-libverbs $(top_builddir)/xlators/protocol/lib/src/libgfproto.la
noinst_HEADERS = ib-verbs.h name.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/transport/ib-verbs \
-I$(top_srcdir)/xlators/protocol/lib/src
CLEANFILES = *~

0
transport/ib-verbs/src/ib-verbs-mem-types.h → xlators/protocol/transport/ib-verbs/src/ib-verbs-mem-types.h
View File

0
transport/ib-verbs/src/ib-verbs.c → xlators/protocol/transport/ib-verbs/src/ib-verbs.c
View File

0
transport/ib-verbs/src/ib-verbs.h → xlators/protocol/transport/ib-verbs/src/ib-verbs.h
View File

0
transport/ib-verbs/src/name.c → xlators/protocol/transport/ib-verbs/src/name.c
View File

0
transport/ib-verbs/src/name.h → xlators/protocol/transport/ib-verbs/src/name.h
View File

0
transport/socket/Makefile.am → xlators/protocol/transport/socket/Makefile.am
View File

11
transport/socket/src/Makefile.am → xlators/protocol/transport/socket/src/Makefile.am
View File

@ -1,4 +1,4 @@
noinst_HEADERS = socket.h name.h
# TODO : change to proper transport dir
transport_LTLIBRARIES = socket.la
transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport
@ -6,9 +6,14 @@ transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/transport
socket_la_LDFLAGS = -module -avoidversion
socket_la_SOURCES = socket.c name.c
socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
$(top_builddir)/xlators/protocol/lib/src/libgfproto.la
noinst_HEADERS = socket.h name.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)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) \
-I$(top_srcdir)/xlators/protocol/transport/socket/src \
-I$(top_srcdir)/xlators/protocol/lib/src
CLEANFILES = *~

0
transport/socket/src/name.c → xlators/protocol/transport/socket/src/name.c
View File

0
transport/socket/src/name.h → xlators/protocol/transport/socket/src/name.h
View File

0
transport/socket/src/socket-mem-types.h → xlators/protocol/transport/socket/src/socket-mem-types.h
View File

0
transport/socket/src/socket.c → xlators/protocol/transport/socket/src/socket.c
View File

0
transport/socket/src/socket.h → xlators/protocol/transport/socket/src/socket.h
View File