Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
06f3d8b6
Commit
06f3d8b6
authored
Mar 14, 2017
by
Steven Murray
Browse files
Renamed static library ctadisk to ctaeos
parent
96896a08
Changes
13
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
06f3d8b6
...
...
@@ -116,7 +116,7 @@ ELSE(DEFINED PackageOnly)
add_subdirectory
(
catalogue
)
add_subdirectory
(
cmdline
)
add_subdirectory
(
common
)
add_subdirectory
(
disk
)
add_subdirectory
(
eos
)
add_subdirectory
(
mediachanger
)
add_subdirectory
(
objectstore
)
add_subdirectory
(
rdbms
)
...
...
disk
/CMakeLists.txt
→
eos
/CMakeLists.txt
View file @
06f3d8b6
...
...
@@ -19,7 +19,7 @@ cmake_minimum_required (VERSION 2.6)
find_package
(
xrootdclient REQUIRED
)
include_directories
(
${
XROOTD_INCLUDE_DIR
}
${
CMAKE_SOURCE_DIR
}
)
add_library
(
cta
disk
add_library
(
cta
eos
DiskReporter.cpp
DiskReporterFactory.cpp
EOSReporter.cpp
)
disk
/DiskReporter.cpp
→
eos
/DiskReporter.cpp
View file @
06f3d8b6
File moved
disk
/DiskReporter.hpp
→
eos
/DiskReporter.hpp
View file @
06f3d8b6
...
...
@@ -18,7 +18,7 @@
#pragma once
namespace
cta
{
namespace
disk
{
namespace
cta
{
namespace
eos
{
class
DiskReporter
{
public:
...
...
disk
/DiskReporterFactory.cpp
→
eos
/DiskReporterFactory.cpp
View file @
06f3d8b6
...
...
@@ -22,7 +22,7 @@
#include
"common/exception/Exception.hpp"
#include
"common/threading/MutexLocker.hpp"
namespace
cta
{
namespace
disk
{
namespace
cta
{
namespace
eos
{
DiskReporter
*
DiskReporterFactory
::
createDiskReporter
(
const
std
::
string
URL
)
{
threading
::
MutexLocker
ml
(
m_mutex
);
...
...
disk
/DiskReporterFactory.hpp
→
eos
/DiskReporterFactory.hpp
View file @
06f3d8b6
...
...
@@ -24,7 +24,7 @@
#include
<string>
namespace
cta
{
namespace
disk
{
namespace
cta
{
namespace
eos
{
class
DiskReporterFactory
{
public:
...
...
disk
/EOSReporter.cpp
→
eos
/EOSReporter.cpp
View file @
06f3d8b6
...
...
@@ -19,7 +19,7 @@
#include
"EOSReporter.hpp"
#include
"common/exception/XrootCl.hpp"
namespace
cta
{
namespace
disk
{
namespace
cta
{
namespace
eos
{
EOSReporter
::
EOSReporter
(
const
std
::
string
&
hostURL
,
const
std
::
string
&
queryValue
)
:
m_fs
(
hostURL
),
m_query
(
queryValue
)
{}
...
...
disk
/EOSReporter.hpp
→
eos
/EOSReporter.hpp
View file @
06f3d8b6
...
...
@@ -21,7 +21,7 @@
#include
"DiskReporter.hpp"
#include
<XrdCl/XrdClFileSystem.hh>
namespace
cta
{
namespace
disk
{
namespace
cta
{
namespace
eos
{
class
EOSReporter
:
public
DiskReporter
{
public:
...
...
disk
/NullReporter.hpp
→
eos
/NullReporter.hpp
View file @
06f3d8b6
...
...
@@ -20,7 +20,7 @@
#include
"DiskReporter.hpp"
namespace
cta
{
namespace
disk
{
namespace
cta
{
namespace
eos
{
class
NullReporter
:
public
DiskReporter
{
public:
...
...
scheduler/ArchiveJob.cpp
View file @
06f3d8b6
...
...
@@ -18,7 +18,7 @@
#include
"scheduler/ArchiveJob.hpp"
#include
"scheduler/ArchiveMount.hpp"
#include
"
disk
/DiskReporterFactory.hpp"
#include
"
eos
/DiskReporterFactory.hpp"
#include
<limits>
//------------------------------------------------------------------------------
...
...
@@ -89,7 +89,7 @@ bool cta::ArchiveJob::complete() {
// We can now record the success for the job in the database.
// If this is the last job of the request, we also report the success to the client.
if
(
m_dbJob
->
succeed
())
{
std
::
unique_ptr
<
disk
::
DiskReporter
>
reporter
(
m_mount
.
createDiskReporter
(
m_dbJob
->
archiveReportURL
));
std
::
unique_ptr
<
eos
::
DiskReporter
>
reporter
(
m_mount
.
createDiskReporter
(
m_dbJob
->
archiveReportURL
));
reporter
->
reportArchiveFullyComplete
();
return
true
;
}
...
...
scheduler/ArchiveMount.cpp
View file @
06f3d8b6
...
...
@@ -77,7 +77,7 @@ uint32_t cta::ArchiveMount::getNbFiles() const {
//------------------------------------------------------------------------------
// createDiskReporter
//------------------------------------------------------------------------------
cta
::
disk
::
DiskReporter
*
cta
::
ArchiveMount
::
createDiskReporter
(
std
::
string
&
URL
)
{
cta
::
eos
::
DiskReporter
*
cta
::
ArchiveMount
::
createDiskReporter
(
std
::
string
&
URL
)
{
return
m_reporterFactory
.
createDiskReporter
(
URL
);
}
...
...
scheduler/ArchiveMount.hpp
View file @
06f3d8b6
...
...
@@ -23,7 +23,7 @@
#include
"scheduler/SchedulerDatabase.hpp"
#include
"scheduler/TapeMount.hpp"
#include
"catalogue/Catalogue.hpp"
#include
"
disk
/DiskReporterFactory.hpp"
#include
"
eos
/DiskReporterFactory.hpp"
#include
<memory>
#include
<atomic>
...
...
@@ -131,7 +131,7 @@ namespace cta {
* @param URL: report address
* @return poitner to the reporter created.
*/
disk
::
DiskReporter
*
createDiskReporter
(
std
::
string
&
URL
);
eos
::
DiskReporter
*
createDiskReporter
(
std
::
string
&
URL
);
/**
* Destructor.
...
...
@@ -157,7 +157,7 @@ namespace cta {
private:
/** An initialized-once factory for archive reports (indirectly used by ArchiveJobs) */
disk
::
DiskReporterFactory
m_reporterFactory
;
eos
::
DiskReporterFactory
m_reporterFactory
;
};
// class ArchiveMount
}
// namespace cta
scheduler/CMakeLists.txt
View file @
06f3d8b6
...
...
@@ -25,7 +25,7 @@ add_library (ctascheduler SHARED
${
CTA_SCHEDULER_SRC_FILES
}
)
install
(
TARGETS ctascheduler DESTINATION usr/
${
CMAKE_INSTALL_LIBDIR
}
)
target_link_libraries
(
ctascheduler ctacommon ctaobjectstore protobuf ctautils cta
disk
)
target_link_libraries
(
ctascheduler ctacommon ctaobjectstore protobuf ctautils cta
eos
)
#add_library (ctaschedulerutils SHARED
# _old_prototype_DummyScheduler.cpp)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment