firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 20:43:02 +01:00
Code Issues

finished fb_inet_server cleanup

Browse Source
This commit is contained in:
alexpeshkoff 2010-04-16 13:33:22 +00:00
parent 72cbd0ee60
commit 4ce63669c1
16 changed files with 13 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/posix/Makefile.in.fbserver
View File

@ -39,7 +39,7 @@ include $(ROOT)/gen/make.shared.variables
@SET_MAKE@
SERVER_Files = $(OS_ServerFiles) server.cpp server_stub.cpp
SERVER_Files = $(OS_ServerFiles) server.cpp
SERVER_Sources = $(addprefix remote/, $(SERVER_Files)) jrd/pwd.cpp
SERVER_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SERVER_Sources)))) $(LIBFBSERVER_Objects) $(COMMON_Objects)

3
builds/posix/Makefile.in.firebird
View File

@ -467,9 +467,6 @@ $(INCLUDE_DEST)/ib_util.h : $(SRC_OtherDistribHeaders)
# create platform-specific export lists (version scripts) in gen
client.firebird.vers: ../builds/posix/firebird.vers
sh vers.sh firebird.vers client
%.vers: ../builds/posix/%.vers
sh vers.sh $(firstword $@)

6
builds/posix/Makefile.in.libfbclient
View File

@ -52,9 +52,6 @@ unexport ISC_PASSWORD
# I would eventually like to set these based on a determination
# if the file GPRE_STATIC exists or not.
SMD_Sources = $(addprefix remote/,$(Server_main_dummy))
SMD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SMD_Sources))))
JRD_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(JRD_ClientSources))))
DSQL_ClientSources = $(addprefix dsql/, $(DSQL_ClientFiles))
@ -87,8 +84,7 @@ FBCLIENT_Objects = $(JRD_ClientObjects) \
$(FBCLASSES_MsgObjects)\
$(OS_SPECIFIC_Objects)\
$(FBCONFIG_Objects) \
$(CLUMPLETS_Objects) \
$(SMD_Objects)
$(CLUMPLETS_Objects)
.PHONY: libfbclient

10
builds/posix/Makefile.in.libfbembed
View File

@ -47,13 +47,7 @@ unexport ISC_USER
unexport ISC_PASSWORD
SERVER_Files = $(OS_ServerFiles) server.cpp
SERVER_Sources = $(addprefix remote/, $(SERVER_Files)) jrd/pwd.cpp
SERVER_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SERVER_Sources))))
AllObjects = $(LIBFBEMBED_Objects) $(SERVER_Objects) $(COMMON_Objects)
AllObjects = $(LIBFBEMBED_Objects) $(COMMON_Objects)
Dependencies = $(AllObjects:.o=.d)
@ -61,7 +55,7 @@ Dependencies = $(AllObjects:.o=.d)
libfbembed : $(LIBIBUTIL_SO) $(LIBFBEMBED_SONAME)
$(LIBFBEMBED_SO): $(LIBFBEMBED_Objects) $(SERVER_Objects) $(COMMON_Objects)
$(LIBFBEMBED_SO): $(AllObjects)
$(LINK_EMBED) -o $@ $^ $(LINK_EMBED_LIBS)
$(LIBFBEMBED_SOBASENAME): $(LIBFBEMBED_SO)

2
builds/posix/Makefile.in.smp_server
View File

@ -41,7 +41,7 @@ include $(ROOT)/gen/make.shared.variables
SERVER_JrdFiles = ThreadData.cpp divorce.cpp dsc.cpp enc.cpp isc_file.cpp isc.cpp \
sdl.cpp status.cpp
SERVER_Files = $(OS_ServerFiles) server.cpp server_stub.cpp
SERVER_Files = $(OS_ServerFiles) server.cpp
SERVER_Other_sources = common/cvt.cpp common/classes/DbImplementation.cpp \
jrd/pwd.cpp jrd/sha.cpp jrd/guid.cpp auth/Auth.cpp
SERVER_Sources = $(addprefix remote/, $(SERVER_Files)) $(addprefix jrd/, $(SERVER_JrdFiles)) $(SERVER_Other_sources)

4
builds/posix/firebird.vers
View File

@ -22,10 +22,6 @@
# All Rights Reserved.
# Contributor(s): ______________________________________.
# private entrypoint for REMOTE server
server_main
#-------------------
# PRIVATE INTERFACE
#-------------------

4
builds/posix/make.defaults
View File

@ -251,14 +251,14 @@ ifneq ($(IsProdTypeBuild),Y)
endif
FIREBIRD_VERS = firebird.vers
FIREBIRD_CLIENT_VERS = client.firebird.vers
FIREBIRD_CLIENT_VERS = firebird.vers
FBTRACE_VERS = fbtrace.vers
FBINTL_VERS = fbintl.vers
IB_UTIL_VERS = ib_util.vers
UDR_ENGINE_VERS = udr_engine.vers
EMPTY_VERS = empty.vers
ALLVERS = $(FIREBIRD_VERS) $(FIREBIRD_CLIENT_VERS) $(FBTRACE_VERS) $(FBINTL_VERS) $(IB_UTIL_VERS)
ALLVERS = $(FIREBIRD_VERS) $(FBTRACE_VERS) $(FBINTL_VERS) $(IB_UTIL_VERS)
ALLVERS += $(UDR_ENGINE_VERS) $(EMPTY_VERS)
LINK_FIREBIRD_SYMBOLS = $(LIB_LINK_MAPFILE)$(FIREBIRD_VERS)

1
builds/posix/prefix.solaris
View File

@ -86,7 +86,6 @@ DEV_FLAGS= -g -xs \
$(COMMON_FLAGS) $(SFIO_FLAGS)
OS_ServerFiles=inet_server.cpp
Server_main_dummy= os/sun/server_main_dummy.cpp
LIB_PLATFORM_RPATH= -R $(1)
LIB_LINK_SONAME= -h $(1)

2
builds/posix/prefix.solaris-64gcc
View File

@ -59,8 +59,6 @@ DEV_FLAGS= $(CFLAGS_COMMON) $(SFIO_FLAGS) $(COMMON_GCC_FLAGS) $(DEBUG_GCC_FLAGS)
OS_ServerFiles=inet_server.cpp
LOCKPRINT_Other_Sources= jrd/ThreadData.cpp
Server_main_dummy = os/sun/server_main_dummy.cpp
LIB_LINK_OPTIONS= -G
LIB_PLATFORM_RPATH=-R $(1)

1
builds/posix/prefix.solx86gcc
View File

@ -44,7 +44,6 @@ OS_ServerFiles=inet_server.cpp
LOCKPRINT_Other_Sources= jrd/ThreadData.cpp
Server_main_dummy = os/sun/server_main_dummy.cpp
LIB_LINK_OPTIONS= -G
LIB_PLATFORM_RPATH= -R $(1)

1
builds/posix/prefix.solx86gcc_64
View File

@ -53,7 +53,6 @@ endif
OS_ServerFiles=inet_server.cpp
LOCKPRINT_Other_Sources= jrd/ThreadData.cpp
Server_main_dummy = os/sun/server_main_dummy.cpp
LINK_OPTS+=-m64
LIB_LINK+=-m64

27
builds/posix/vers.sh.in
View File

@ -37,19 +37,7 @@ platform_aix() {
platform_darwin() {
for i in `grep -v '#' ${1}`
do
# Client export list must not contain server_main
if test "${2}" = "client"
then
if test "$i" = "server_main"
then
i=""
fi
fi
if test -n "$i"
then
echo "${TAB}_$i"
fi
echo "${TAB}_$i"
done
}
@ -75,10 +63,11 @@ platform_linux() {
}
# main
FILE=${1}
if test -z "$FILE"
then
echo "Usage: vers.sh export-symbol-file-name {client}"
echo "Usage: vers.sh export-symbol-file-name"
exit 1
fi
@ -89,12 +78,6 @@ then
exit 1
fi
CLIENT=${2}
if test -z "$CLIENT"
then
TO="$FILE"
else
TO="$CLIENT.$FILE"
fi
TO="$FILE"
platform_@EXPORT_SYMBOLS_STYLE@ $FROM ${2} >$TO
platform_@EXPORT_SYMBOLS_STYLE@ $FROM >$TO

1
configure.in
View File

@ -1407,7 +1407,6 @@ gen/Makefile.plugins:${MAKE_SRC_DIR}/Makefile.in.plugins
gen/examples/Makefile.examples:${MAKE_SRC_DIR}/Makefile.in.examples
gen/examples/Makefile.plugins_examples:${MAKE_SRC_DIR}/Makefile.in.plugins_examples
gen/Makefile.libfbembed:${MAKE_SRC_DIR}/Makefile.in.libfbembed
gen/Makefile.inet_server:${MAKE_SRC_DIR}/Makefile.in.inet_server
gen/Makefile.embed.util:${MAKE_SRC_DIR}/Makefile.in.embed.util
gen/Makefile.embed.fbudf:${MAKE_SRC_DIR}/Makefile.in.embed.fbudf
gen/Makefile.embed.gfix:${MAKE_SRC_DIR}/Makefile.in.embed.gfix

4
src/remote/inet_server.cpp
View File

@ -119,7 +119,7 @@ static bool serverClosing = false;
extern "C" {
int FB_EXPORTED server_main( int argc, char** argv)
int CLIB_ROUTINE main( int argc, char** argv)
{
/**************************************
*
@ -266,8 +266,6 @@ int FB_EXPORTED server_main( int argc, char** argv)
INET_SERVER_flag |= SRVR_debug;
}
gds__log("modes are c=%d sac=%d s=%d", classic, standaloneClassic, super);
// activate paths set with -e family of switches
ISC_set_prefix(0, 0);

13
src/remote/os/sun/server_main_dummy.cpp
View File

@ -1,13 +0,0 @@
#include "firebird.h"
#include "../jrd/common.h"
extern "C" {
int CLIB_ROUTINE server_main( int argc, char** argv)
{
/*NOOP: this routine is needed to implement
server_main as it's defined by firebird.vers mapfile
linking libfbclient with Sun-like LD
*/
return 0;
}
}

16
src/remote/server_stub.cpp
View File

@ -1,16 +0,0 @@
#include "firebird.h"
#include "../jrd/common.h"
#ifndef MINGW
extern "C" {
int FB_EXPORTED server_main( int argc, char** argv);
}
// This routine invokes server loop implemented in the shared library
int CLIB_ROUTINE main(int argc, char** argv)
{
return server_main(argc, argv);
}
#endif