CDPP / DDServer

Commit 7c416dd41554297c9f0d76ecfb592bc40c71b5d0

Authored by Benjamin Renard
1 parent 86f177cf
Exists in master and in 10 other branches WIP, clean_real, create-user, epntap, evol_9042, fix-cdaweb, livraison-akka, sqlite_test, time-in-double, ubuntu

Fix some bugs with cmake configuration files + Fix a bug during get data request… 

… (update the current opened file)
Showing 4 changed files with 7 additions and 1 deletions   Show diff stats
Inline Side-by-side
.gitignore
  Diff comments   View file @7c416dd
  1 +.project
1 2 build/
2 3 scripts/StartServer
... ...
CMakeLists.txt
  Diff comments   View file @7c416dd
... ... @@ -2,16 +2,19 @@ cmake_minimum_required(VERSION 2.6)
2 2  
3 3 PROJECT(DDServer)
4 4  
  5 +add_definitions( -DLINUX )
5 6 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/bin/)
6 7 set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib/)
7 8  
8 9 if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
9 10 #64 bits
  11 + MESSAGE( STATUS "64 bits" )
10 12 set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread")
11 13 set(CMAKE_C_FLAGS_RELEASE "-DLINUX -Dlinux -m64 -march=core2 -fPIC -D_REENTRANT -pthread")
12 14 set(USRLIB_DIR "/usr/lib64/:/usr/local/lib64/")
13 15 else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
14 16 #32 bits
  17 + MESSAGE( STATUS "32 bits" )
15 18 set(CMAKE_C_FLAGS_DEBUG "-ggdb -DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double -pthread")
16 19 set(CMAKE_C_FLAGS_DEBUG "-DLINUX -march=i686 -fPIC -Dlinux -D_REENTRANT -malign-double -pthread")
17 20 set(USRLIB_DIR "/usr/lib/:/usr/local/lib/")
... ...
src/SERVER/CMakeLists.txt
  Diff comments   View file @7c416dd
... ... @@ -21,7 +21,6 @@ target_link_libraries(
21 21 DD_Client
22 22 ${NETCDFLIBRARY}
23 23 ${CRYPT_LIBRARY}
24   - mpi
25 24 )
26 25  
27 26 install (TARGETS DD_Server DESTINATION bin)
... ...
src/SERVER/DD_GetData.c
  Diff comments   View file @7c416dd
... ... @@ -969,6 +969,9 @@ int GetAttribute(int ID, char *VarName)
969 969 DD_Var[ID]->LastPacketFlag = MOREDATA;
970 970 DD_Var[ID]->NewFile = 1; // We have to reset all variables
971 971 DD_Var[ID]->NewFileWasOpen = 1;
  972 + //BRE - Update the current opened file
  973 + DD_Var[ID]->CurrCushN = Local.CurrCushN;
  974 + DD_Var[ID]->ncID = Local.ncID;
972 975 if(Verbose) fprintf(stderr,"GetMultiData(ID=%d), Retun by EOF, MOREDATA, DD_Var[ID]->VarData = %p\n",ID,DD_Var[ID]->VarData);
973 976 return MOREDATA;
974 977 case TRYAGAIN: // just wait and try again
... ...