Commit b3eb2bd6 authored by Cedric CAFFY's avatar Cedric CAFFY
Browse files

Renamed the "eos" directory into "disk"

Moved disk-operations-related code into the new "disk" directory
parent c333d611
......@@ -139,7 +139,7 @@ ELSE(DEFINED PackageOnly)
add_subdirectory(catalogue)
add_subdirectory(common)
add_subdirectory(eos)
add_subdirectory(disk)
add_subdirectory(mediachanger)
add_subdirectory(objectstore)
add_subdirectory(python)
......
......@@ -246,6 +246,7 @@ The shared libraries
%{_libdir}/libctamessagesutils.so*
%{_libdir}/libctardbms.so*
%{_libdir}/libctardbmswrapper.so*
%{_libdir}/libdisk.so*
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-catalogue.conf.example
#CTA-lib installs libraries so we need ldconfig.
......
......@@ -16,11 +16,30 @@
cmake_minimum_required (VERSION 2.6)
find_package (xrootd REQUIRED)
find_package (xrootdclient REQUIRED)
include_directories (${XROOTD_INCLUDE_DIR} ${CMAKE_SOURCE_DIR})
add_library (ctaeos
add_library(disk SHARED
DiskReporter.cpp
DiskReporterFactory.cpp
EOSReporter.cpp)
EOSReporter.cpp
DiskFile.cpp
RadosStriperPool.cpp
)
target_link_libraries (disk XrdCl cryptopp radosstriper)
set_property(TARGET disk PROPERTY SOVERSION "${CTA_SOVERSION}")
set_property(TARGET disk PROPERTY VERSION "${CTA_LIBVERSION}")
add_library(ctadiskunittests SHARED
CryptoPPTest.cpp
)
set_property(TARGET ctadiskunittests PROPERTY SOVERSION "${CTA_SOVERSION}")
set_property(TARGET ctadiskunittests PROPERTY VERSION "${CTA_LIBVERSION}")
install(TARGETS disk DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
install(TARGETS ctadiskunittests DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
\ No newline at end of file
......@@ -23,9 +23,9 @@
#include <gtest/gtest.h>
#include "common/threading/Thread.hpp"
#include "castor/tape/tapeserver/file/DiskFileImplementations.hpp"
#include "castor/tape/tapeserver/file/DiskFile.hpp"
#include "castor/tape/tapeserver/file/RadosStriperPool.hpp"
#include "disk/DiskFileImplementations.hpp"
#include "disk/DiskFile.hpp"
#include "disk/RadosStriperPool.hpp"
#include <cryptopp/base64.h>
#include <cryptopp/osrng.h>
......
......@@ -23,8 +23,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "castor/tape/tapeserver/file/DiskFileImplementations.hpp"
#include "castor/tape/tapeserver/file/RadosStriperPool.hpp"
#include "disk/DiskFileImplementations.hpp"
#include "disk/RadosStriperPool.hpp"
#include "common/exception/Errnum.hpp"
#include "common/threading/MutexLocker.hpp"
#include "common/utils/utils.hpp"
......
......@@ -23,7 +23,7 @@
#pragma once
#include "tapeserver/castor/tape/tapeserver/file/DiskFile.hpp"
#include "disk/DiskFile.hpp"
#include "tapeserver/castor/tape/tapeserver/file/Structures.hpp"
#include "tapeserver/castor/tape/tapeserver/daemon/VolumeInfo.hpp"
#include "common/exception/XrootCl.hpp"
......
......@@ -18,7 +18,7 @@
#include "scheduler/ArchiveJob.hpp"
#include "scheduler/ArchiveMount.hpp"
#include "eos/DiskReporterFactory.hpp"
#include "disk/DiskReporterFactory.hpp"
#include "common/make_unique.hpp"
#include <limits>
#include <cryptopp/base64.h>
......
......@@ -23,7 +23,7 @@
#include "common/Timer.hpp"
#include "scheduler/SchedulerDatabase.hpp"
#include "catalogue/Catalogue.hpp"
#include "eos/DiskReporter.hpp"
#include "disk/DiskReporter.hpp"
#include <stdint.h>
#include <string>
......
......@@ -23,7 +23,7 @@
#include "scheduler/SchedulerDatabase.hpp"
#include "scheduler/TapeMount.hpp"
#include "catalogue/Catalogue.hpp"
#include "eos/DiskReporterFactory.hpp"
#include "disk/DiskReporterFactory.hpp"
#include <memory>
#include <atomic>
......
......@@ -34,7 +34,7 @@ set_property(TARGET ctascheduler PROPERTY VERSION "${CTA_LIBVERSION}")
install (TARGETS ctascheduler DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
target_link_libraries (ctascheduler ctacommon ctaobjectstore ${PROTOBUF3_LIBRARIES} ctaeos File)
target_link_libraries (ctascheduler ctacommon ctaobjectstore ${PROTOBUF3_LIBRARIES} disk)
#add_library (ctaschedulerutils SHARED
# _old_prototype_DummyScheduler.cpp)
......
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