compile on 18.04 x86_64, removed compiler warnings, gitlab conventions

CHANGELOG

@@ -7,3 +7,6 @@
 
 2013/03/06 release_04
 - compilato con tango-8.0.5
+
+2020/03/31 release 1.0.1
+- moved to gitlab, new project structure and makefile, compiled on 18.04 x86_64

Makefile

-#=============================================================================
-#
-# file :        Makefile
-#
-# description : Include for the RPC2TangoBridge class.
-#
-# project :     Makefile to generate a Tango server
-#
-# $Author: claudio $
-#
-# $Revision: 1.8 $
-#
-#
-# copyleft :    European Synchrotron Radiation Facility
-#               BP 220, Grenoble 38043
-#               FRANCE
-#
-#=============================================================================
-#  		This file is generated by POGO
-#	(Program Obviously used to Generate tango Object)
-#
-#         (c) - Software Engineering Group - ESRF
-#=============================================================================
-#
+NAME_SRV = rpc2tango-bridge-srv
 
-CLASS      = RPC2TangoBridge
-MAJOR_VERS = 1
-MINOR_VERS = 1
-RELEASE    = Release_$(MAJOR_VERS)_$(MINOR_VERS)
+CXXFLAGS +=  -I/runtime/elettra/include
+LDFLAGS += -L/runtime/elettra/lib  -llpc -lnc -lRpcResolver -llpcresolve
 
-#-----------------------------------------
-#	Set default home directories
-#-----------------------------------------
-
-TANGO_HOME   =  /usr/local/tango-9.2.5a
-OMNI_HOME = /usr/local/omniorb-4.2.1
-ZMQ_HOME = //usr/local/zeromq-4.0.7
-CPP_SERVERS  =  $(TANGO_HOME)/cppserver
-
-
-
-#ifdef no_debug
-	DEBUG = -O2
-#else
-#	DEBUG = -g
-#endif
-
-CC = c++
-CC_SHLIB = $(CC)  -fPIC
-AR = ar
-
-AR_SL = $(CC) -fPIC -shared 
-SL_EXT = so
-VERS_OPT = -Wl,-soname,
-
-INCLUDE_DIRS =  -I$(TANGO_HOME)/include/tango \
-					 -I$(OMNI_HOME)/include \
-					 -I$(ZMQ_HOME)/include \
-					 -I.	\
-                -I$(CPP_SERVERS)/include -I/runtime/elettra/include
-
-SERVER_DIR  = ./rpcserver
-OBJS_DIR    = obj
-LIB_DIRS    = -L $(TANGO_HOME)/lib -L $(OMNI_HOME)/lib -L$(ZMQ_HOME)/lib -L/runtime/elettra/lib
-
-TARGET_LIB = $(CPP_SERVERS)/lib/libtgclasses.a
-
-
-#-----------------------------------------
-#	Set  CXXFLAGS and LFLAGS
-#-----------------------------------------
-
-
-CXXFLAGS =  -std=c++0x $(DEBUG) -D_REENTRANT $(INCLUDE_DIRS)
-LFLAGS =  $(DEBUG) $(LIB_DIRS)  		\
-				-ltango		\
-				-llog4tango	\
-				-lomniORB4 	\
-				-lomniDynamic4	\
-				-lomnithread	\
-				-lCOS4		\
-				-lzmq		\
-				-ldl -lpthread -llpc -lnc \
-				-lRpcResolver -llpcresolve
-
-
-
-
-#-----------------------------------------
-#	Set  dependences
-#-----------------------------------------
-
-DEPENDPATH += $(SERVER_DIR)
-
-SVC_OBJS = $(OBJS_DIR)/main.o	\
-		$(OBJS_DIR)/ClassFactory.o	\
-		$(OBJS_DIR)/$(CLASS)Class.o	\
-		$(OBJS_DIR)/$(CLASS)StateMachine.o	\
-		$(OBJS_DIR)/$(CLASS).o \
-		$(OBJS_DIR)/RPC2TangoBridgeThread.o	\
-		$(OBJS_DIR)/BridgeAttr.o	\
-		$(OBJS_DIR)/RpcHandle.o	$(OBJS_DIR)/RpcWriteHandle.o	\
-		$(OBJS_DIR)/read_dynamic_attribute.o	\
-		$(OBJS_DIR)/write_dynamic_attribute.o	\
-		$(OBJS_DIR)/attribute_converter.o \
-		$(OBJS_DIR)/RPCHandleSet.o \
-		$(OBJS_DIR)/RpcReadHandle.o
-
-SHLIB_OBJS = 	$(OBJS_DIR)/RPC2TangoBridgeThread.so.o \
-		$(OBJS_DIR)/$(CLASS)Class.so.o	\
-		$(OBJS_DIR)/$(CLASS)StateMachine.so.o	\
-		$(OBJS_DIR)/$(CLASS).so.o
-
-
-SVC_INC = $(CLASS)Class.h \
-		RPC2TangoBridgeThread.h \
-		BridgeAttr.h \
-		RpcHandle.h \
-		RpcWriteHandle.h \
-		attribute_converter.h \
-		RPCHandleSet.h \
-		RpcReadHandle.h \
-		$(CLASS).h
-
-
-$(OBJS_DIR)/%.o: %.cpp $(SVC_INC)
-	$(CC) $(CXXFLAGS) -c $< -o $(OBJS_DIR)/$*.o
-			
-$(OBJS_DIR)/%.so.o: %.cpp $(SVC_INC)
-	$(CC_SHLIB) $(CXXFLAGS) -c $< -o $(OBJS_DIR)/$*.so.o
-
-
-#-----------------------------------------
-#	 Make Entry
-#-----------------------------------------
-all: $(CLASS)
-	
-$(CLASS):	make_obj_dir make_bin_dir $(SVC_OBJS)
-	$(CC) $(SVC_OBJS) -o $(CLASS) $(LFLAGS)
-	@mv $(CLASS) bin/$(CLASS)
-
-shlib:	make_obj_dir make_shlib_dir $(SHLIB_OBJS)
-	$(AR_SL) -o \
-		shlib/$(CLASS).$(SL_EXT).$(MAJOR_VERS).$(MINOR_VERS) \
-		$(VERS_OPT)shlib/$(CLASS).$(SL_EXT).$(MAJOR_VERS) \
-		$(SHLIB_OBJS) $(LFLAGS)
-	@rm -f shlib/$(CLASS).$(SL_EXT)
-	@cd  shlib; \
-		ln -s $(CLASS).$(SL_EXT).$(MAJOR_VERS).$(MINOR_VERS) $(CLASS).$(SL_EXT)
-
-clean:
-	rm -f $(OBJS_DIR)/*.o  \
-	$(OBJS_DIR)/*.so.o \
-	bin/$(CLASS) \
-	core
-
-make_obj_dir:
-	@mkdir -p obj
-
-make_bin_dir:
-	@mkdir -p bin
-
-make_shlib_dir:
-	@mkdir -p shlib
-	
-#-----------------------------------------
-#	 Install binary file
-#-----------------------------------------
-install:
-	cp bin/$(CLASS)  $(TANGO_HOME)/bin
-
-#-----------------------------------------
-#	 Update class library and header files
-#	recompile without debug mode.
-#-----------------------------------------
-lib: clean
-	@make no_debug=1
-	cp *.h $(CPP_SERVERS)/include
-	ar ruv $(TARGET_LIB)/$(CLASS).o
-	ar ruv $(TARGET_LIB)/$(CLASS)Class.o
-	ar ruv $(TARGET_LIB)/$(CLASS)StateMachine.o
-	ident  $(TARGET_LIB)/* | grep $(CLASS)
-
-#----------------------------------------------------
-#	Tag the CVS module corresponding to this class
-#----------------------------------------------------
-tag:
-	@cvstag "$(CLASS)-$(RELEASE)"
-	@make   $(CLASS)
-	@make show_tag
-
-show_tag:
-	@cvstag -d 
+include ../makefiles/Make-9.3.3.in

RPC2TangoBridge.cpp → src/RPC2TangoBridge.cpp

-static const char *RcsId = "$Header: /home/cvsadm/cvsroot/elettra/server/RPC2TangoBridge/RPC2TangoBridge.cpp,v 1.6 2017-03-28 09:39:02 claudio Exp $";
 //+=============================================================================
 //
 // file :         RPC2TangoBridge.cpp
@@ -124,15 +123,10 @@ RPC2TangoBridge::RPC2TangoBridge(Tango::DeviceClass *cl,const char *s,const char
 void RPC2TangoBridge::delete_device()
 {
 	//	Delete device's allocated object
-	int cnt = 0, handlecnt = 0;
-	int totatt;
+	
 	set_state(Tango::CLOSE);
 	set_status("deallocating attributes and freeing resources");
 
-	//printf("\e[1;32m*\e[0m freeing RPC resources and deleting dynamic attributes...\n");
-
-	totatt = namesMap.size() + spectrumNamesMap.size();
-
 	map<string, BridgeAttr* >::iterator mapiter;
 	/* NOTE: tango: device.c if  an attribute already exists, the new attribute is deleted!
 	 * So: remove all attributes in delete device.
@@ -249,7 +243,7 @@ void RPC2TangoBridge::get_device_property()
  */
 void RPC2TangoBridge::AllocateAttributes()
 {
-	int i = 0, totatt = 0, j;
+	//int i = 0, totatt = 0, j;
 	char rpcentity[MAXLEN];
 
 	UserDefaultAttrProp default_att_prop;
@@ -275,14 +269,14 @@ void RPC2TangoBridge::AllocateAttributes()
 // 		//exit(EXIT_SUCCESS);
 // 	}
 
-	for(i = 0; i < rpc_items.size(); i++)
+	for(unsigned int i = 0; i < rpc_items.size(); i++)
 	{
 // 		printf("\n- rpc_items %d:\"%s\"\n", i, rpc_items[i].c_str());
 		memset(rpcentity, 0, MAXLEN);
 		strncpy(rpcentity, rpc_items[i].c_str(), MAXLEN - 1);
 // 		print_progress(totatt, i);
 
-		bool force_is_spectrum = force_spectrum(rpcentity);
+		/*bool force_is_spectrum = */force_spectrum(rpcentity);
 		map<string, BridgeAttr*> ::iterator scalarMapIter = namesMap.find(string(rpcentity));
 		map<string, SpectrumBridgeAttr*> ::iterator spectrumMapIter = spectrumNamesMap.find(string(rpcentity));
 		if( scalarMapIter != namesMap.end() || spectrumMapIter != spectrumNamesMap.end() )
@@ -546,7 +540,7 @@ void RPC2TangoBridge::on()
 
 bool RPC2TangoBridge::force_spectrum(char *s)
 {
-	int i;
+	unsigned  int i;
 	for(i = 0; i < strlen(s); i++)
 		if(s[i] == ',')
 			break;

RPC2TangoBridgeStateMachine.cpp → src/RPC2TangoBridgeStateMachine.cpp

-static const char *RcsId = "$Header: /home/cvsadm/cvsroot/elettra/server/RPC2TangoBridge/RPC2TangoBridgeStateMachine.cpp,v 1.1.1.1 2008-04-28 09:13:16 giacomo Exp $";
 //+=============================================================================
 //
 // file :         RPC2TangoBridgeStateMachine.cpp

RPC2TangoBridgeThread.h → src/RPC2TangoBridgeThread.h

@@ -23,6 +23,6 @@ class RPC2TangoBridgeThread : public omni_thread
 		
 };
 
-};
+}
 
 #endif

RPCHandleSet.cpp → src/RPCHandleSet.cpp

@@ -19,7 +19,7 @@ RPCHandleSet *RPCHandleSet::instance()
 
 RPCReadHandle *RPCHandleSet::readHandleFromList(const char *rpc_call)
 {
-	int i, res;
+	unsigned int i, res;
 	RPCReadHandle *han;
 	char *host;
 	short int port;
@@ -41,7 +41,7 @@ RPCReadHandle *RPCHandleSet::readHandleFromList(const char *rpc_call)
 
 RPCWriteHandle *RPCHandleSet::writeHandleFromList(const char *rpc_call)
 {
-	int i, res;
+	unsigned int i, res;
 	RPCWriteHandle *han;
 	char *host;
 	short int port;
@@ -63,7 +63,7 @@ RPCWriteHandle *RPCHandleSet::writeHandleFromList(const char *rpc_call)
 
 void RPCHandleSet::removeHandle(RPCHandle *h)
 {
-	int i;
+	unsigned int i;
 	for(i = 0; i < rpcHandles.size(); i++)
 	{
 		if(rpcHandles[i] == h)
@@ -81,7 +81,7 @@ void RPCHandleSet::removeHandle(RPCHandle *h)
 
 RPCHandle *RPCHandleSet::handleFromList(const char *rpc_call)
 {
-	int i, res;
+	unsigned int i, res;
 	RPCHandle *han;
 	char *host;
 	short int port;

RpcHandle.cpp → src/RpcHandle.cpp

@@ -105,7 +105,7 @@ bool RPCHandle::connected()
 
 int RPCHandle::split_rpccall(const char *call, char* fam, char *mem, char* act, char* mode)
 {
-	int i = 0, delim1, delim2, delim3;
+	unsigned int i = 0, delim1, delim2, delim3;
 	int underline_cnt = 0;
 	int calllen = strlen(call);
 

RpcReadHandle.cpp → src/RpcReadHandle.cpp

@@ -10,9 +10,9 @@ RPCReadHandle::RPCReadHandle(RPCHandle* h) : RPCHandle(h)
 	
 }
 
-long int RPCReadHandle::read_long(const char *callname, int* ok)
+idl_long_int RPCReadHandle::read_long(const char *callname, int* ok)
 {
-	long int ret;
+	idl_long_int ret;
 	char error[MAXERRLEN];
 	long res = -1;
 	char fam[RPCSPLITLEN], mem[RPCSPLITLEN], act[RPCSPLITLEN], mode[RPCSPLITLEN];
@@ -121,9 +121,9 @@ unsigned char RPCReadHandle::read_uchar(const char *callname, int* ok)
 
 }
 
-short int RPCReadHandle::read_short(const char *callname, int* ok)
+idl_short_int RPCReadHandle::read_short(const char *callname, int* ok)
 {
-	short ret;
+	idl_short_int ret;
 	long res = -1;
 	char error[MAXERRLEN];
 	char fam[RPCSPLITLEN], mem[RPCSPLITLEN], act[RPCSPLITLEN], mode[RPCSPLITLEN];
@@ -405,7 +405,7 @@ booleanArray RPCReadHandle::read_sboolean(const char *callname, int* ok)
         booleanArray rdata;
         rdata.length = 0;
         rdata.sequence = NULL;
-	long rfLong;
+	idl_long_int rfLong;
 	
 	if(split_rpccall(callname, fam, mem, act, mode) < 0)
 	{

RpcReadHandle.h → src/RpcReadHandle.h

@@ -17,9 +17,9 @@ class RPCReadHandle : public RPCHandle
 	public:
 		RPCReadHandle(RPCHandle *h);
 		
-		long int read_long(const char *callname, int* ok);
+		idl_long_int read_long(const char *callname, int* ok);
 		double read_double(const char *callname, int* ok);
-		short int read_short(const char *callname, int* ok);
+		idl_short_int read_short(const char *callname, int* ok);
 		unsigned char read_uchar(const char *callname, int* ok);
 		unsigned char read_boolean(const char *callname, int* ok);
 		string read_string(const char *callname, int* ok);

RpcWriteHandle.cpp → src/RpcWriteHandle.cpp

@@ -21,7 +21,7 @@ RPCWriteHandle::~RPCWriteHandle()
 	
 }
 
-bool RPCWriteHandle::write_long(const char *callname, long lvalue)
+bool RPCWriteHandle::write_long(const char *callname, idl_long_int lvalue)
 {
 	bool ret;
 	char error[MAXERRLEN];
@@ -107,7 +107,7 @@ bool RPCWriteHandle::write_double(const char *callname,  double dvalue)
         return ret;
 }
 
-bool RPCWriteHandle::write_short(const char *callname, short svalue)
+bool RPCWriteHandle::write_short(const char *callname, idl_short_int svalue)
 {
 	bool ret;
 	long res = -1;
@@ -148,7 +148,7 @@ bool RPCWriteHandle::write_short(const char *callname, short svalue)
 
 bool RPCWriteHandle::write_string(const char *callname, char **s)
 {
-	bool ret;
+//	bool ret;
 // 	long res = -1;
 // 	char error[MAXERRLEN];
 // 	char fam[RPCSPLITLEN], mem[RPCSPLITLEN], act[RPCSPLITLEN], mode[RPCSPLITLEN];
@@ -182,7 +182,7 @@ bool RPCWriteHandle::write_string(const char *callname, char **s)
 // 	/* release lock */
 // 	unlockRpc();
 	//printf("\e[1;35m;4minfo\e[0m write_string not implemented yet\n");
-	ret  = -1;
+//	ret  = -1;
         return false;
 
 }