Commit f9d7aef5 authored by Eric Cano's avatar Eric Cano
Browse files

Catching up with master branch.

parents 0ef08970 a469a238
......@@ -145,7 +145,8 @@ ELSE(DEFINED PackageOnly)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
endif (APPLE)
set (CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
#set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wnon-virtual-dtor")
set_property (DIRECTORY PROPERTY COMPILE_DEFINITIONS _LARGEFILE64_SOURCE)
......@@ -170,6 +171,7 @@ ELSE(DEFINED PackageOnly)
add_subdirectory (dlf)
if (${COMPILE_SERVER} STREQUAL "1")
add_subdirectory (gridftp2)
add_subdirectory (ceph)
endif (${COMPILE_SERVER} STREQUAL "1")
add_subdirectory (h)
if (${COMPILE_SERVER} STREQUAL "1")
......@@ -233,12 +235,11 @@ endif (${COMPILE_PACKAGING} STREQUAL "1")
# COMMENT "Not running the unit tests" VERBATIM)
configure_file(test/castorThreadedUnitTests.supp test/castorThreadedUnitTests.supp COPYONLY)
configure_file(test/VCastorUnitTests.supp test/VCastorUnitTests.supp COPYONLY)
add_custom_target(test test/castorUnitTests
#
COMMAND valgrind --track-fds=yes --leak-check=full --demangle=no --gen-suppressions=all --show-reachable=yes --error-exitcode=1 --suppressions=test/VCastorUnitTests.supp test/castorUnitTests
COMMAND valgrind --track-fds=yes --leak-check=full --demangle=no --gen-suppressions=all --show-reachable=yes --error-exitcode=1 test/castorUnitTests
COMMAND test/castorThreadedUnitTests
COMMAND valgrind --track-fds=yes --leak-check=full --show-reachable=yes --error-exitcode=1 --suppressions=test/VCastorUnitTests.supp test/castorThreadedUnitTests
COMMAND valgrind --track-fds=yes --leak-check=full --show-reachable=yes --error-exitcode=1 test/castorThreadedUnitTests
COMMAND valgrind --tool=helgrind -v --demangle=no --conflict-cache-size=30000000 --error-exitcode=1 --suppressions=test/castorThreadedUnitTests.supp test/castorThreadedUnitTests
COMMAND test/castorMultiprocessUnitTests
COMMAND valgrind --tool=helgrind --error-exitcode=1 --suppressions=test/castorThreadedUnitTests.supp test/castorMultiprocessUnitTests
......
------------
- 2.1.15-0 -
------------
DRAFT NOTES
Packaging
---------
- xrootd4
- rpyc-3.3
- ceph
- zmq
- python-crypto
- Dropped castor-job
- change of package name for gridFTP plugins (-int disappears)
Configuration changes
---------------------
If missing, add the following privilege in Cupv:
Cupvadd --user stage --group st --src ^HEADNODE$ --tgt ^HEADNODE$ --priv ADMIN
Change of key location and names (not -int anymore):
+ /etc/grid-security/castor-gridftp-dsi/castor-gridftp-dsi-cert.pem
+ /etc/grid-security/castor-gridftp-dsi/castor-gridftp-dsi-key.pem
-------------
- 2.1.14-13 -
-------------
......
/**** This file has been autogenerated by gencastor from Umbrello UML model ***/
/******************************************************************************
* castor/BaseAddress.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......
/**** This file has been autogenerated by gencastor from Umbrello UML model ***/
/******************************************************************************
* castor/BaseAddress.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......
/******************************************************************************
* BaseCnvSvc.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
*
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
// Include Files
......
/******************************************************************************
* BaseCnvSvc.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
*
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#pragma once
......
/******************************************************************************
* BaseObject.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
*
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
// Include Files
......
/******************************************************************************
* BaseObject.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
* Basic object support, including pointer to Services and log support
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#pragma once
......
/******************************************************************************
* BaseSvc.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
*
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
// Local Files
......
/******************************************************************************
* BaseSvc.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
*
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#pragma once
......
......@@ -31,6 +31,7 @@ if (${COMPILE_SERVER} STREQUAL "1")
add_subdirectory (rh)
add_subdirectory (job)
add_subdirectory (scheduler)
add_subdirectory (server)
add_subdirectory (stager/daemon)
add_subdirectory (tape)
add_subdirectory (vdqm)
......@@ -120,7 +121,6 @@ set (CLIENT_LIB_SRC_FILES
io/StreamStagePutDoneRequestCnv.cpp
io/StreamStagePutRequestCnv.cpp
io/StreamStageRmRequestCnv.cpp
io/StreamThreadNotificationCnv.cpp
io/StreamStgFilesDeletedCnv.cpp
io/StreamStgFilesDeletedResponseCnv.cpp
io/StreamAbortResponseCnv.cpp
......@@ -147,12 +147,6 @@ set (CLIENT_LIB_SRC_FILES
log/LogContext.cpp
log/Message.cpp
log/Param.cpp
metrics/Counter.cpp
metrics/InternalCounter.cpp
metrics/Histogram.cpp
metrics/MetricsCollector.cpp
metrics/UpdateThread.cpp
metrics/ObjTypeCounter.cpp
query/DiskPoolQueryResponse.cpp
query/FileSystemDescription.cpp
query/DiskServerDescription.cpp
......@@ -174,22 +168,6 @@ set (CLIENT_LIB_SRC_FILES
rh/FileQryResponse.cpp
rh/IOResponse.cpp
rh/BasicResponse.cpp
server/AuthListenerThreadPool.cpp
server/BaseThreadPool.cpp
server/Daemon.cpp
server/DynamicThreadPool.cpp
server/ListenerThreadPool.cpp
server/MultiThreadedDaemon.cpp
server/TCPListenerThreadPool.cpp
server/UDPListenerThreadPool.cpp
server/ForkedProcessPool.cpp
server/SignalThreadPool.cpp
server/DbAlertedThreadPool.cpp
server/Mutex.cpp
server/NotifierThread.cpp
server/SelectProcessThread.cpp
server/ThreadNotification.cpp
server/Queue.cpp
stager/CastorFile.cpp
stager/DiskCopyInfo.cpp
stager/DiskCopyForRecall.cpp
......@@ -274,7 +252,11 @@ set (CLIENT_LIB_SRC_FILES
../client/src/stager/stager_client_api_listPrivileges.cpp
../client/src/stager/stager_errmsg.c
../client/src/stager/stager_mapper.c)
add_library (castorclient SHARED ${CLIENT_LIB_SRC_FILES})
add_library (castorclient SHARED
${CLIENT_LIB_SRC_FILES}
${CLIENT_LIB_PROC_CAP_SRC_FILES})
# Relax compilation of old code full of pointer casting. Funnily enough,
# the compiler only complains in -O2 mode (RelWithDebInfo in cmake).
set_property(SOURCE ../client/src/stager/stager_errmsg.c APPEND PROPERTY COMPILE_FLAGS -fno-strict-aliasing)
......@@ -423,13 +405,6 @@ if (${COMPILE_SERVER} STREQUAL "1")
DESTINATION ${CASTOR_DEST_CPP_HEADERS_DIR}/io
PERMISSIONS ${CASTOR_HEADER_PERMS})
install(FILES
metrics/Counter.hpp
metrics/Histogram.hpp
metrics/MetricsCollector.hpp
DESTINATION ${CASTOR_DEST_CPP_HEADERS_DIR}/metrics
PERMISSIONS ${CASTOR_HEADER_PERMS})
install(FILES
query/DiskPoolQueryType.hpp
DESTINATION ${CASTOR_DEST_CPP_HEADERS_DIR}/query
......
/******************************************************************************
* CnvFactory.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
*
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#pragma once
......
/******************************************************************************
* Constants.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
*
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
// Include Files
......
/******************************************************************************
* Constants.h
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
*
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#pragma once
......
/******************************************************************************
* Constants.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -24,7 +23,7 @@
* - Ids of services (SVC_***)
* - Ids of persistent representations (REP_***)
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#pragma once
......
/******************************************************************************
* Converters.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
*
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include "Converters.hpp"
......
/******************************************************************************
* Converters.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
*
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#pragma once
......
/******************************************************************************
* Factories.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
*
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include "Factories.hpp"
......
/******************************************************************************
* Factories.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -20,7 +19,7 @@
*
*
*
* @author Sebastien Ponce
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#pragma once
......
/**** This file has been autogenerated by gencastor from Umbrello UML model ***/
/******************************************************************************
* castor/IAddress.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment