Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
HyperLoom
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ADAS
HyperLoom
Commits
24a1c504
Commit
24a1c504
authored
Jul 04, 2016
by
Stanislav Bohm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ENH: Moved from C++14 to C++11 (to support older compilers)
parent
e12fe38c
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
68 additions
and
15 deletions
+68
-15
src/libloom/CMakeLists.txt
src/libloom/CMakeLists.txt
+2
-1
src/libloom/compat.h
src/libloom/compat.h
+41
-0
src/libloom/sendbuffer.cpp
src/libloom/sendbuffer.cpp
+1
-1
src/libloom/taskfactory.h
src/libloom/taskfactory.h
+1
-0
src/libloom/taskinstance.h
src/libloom/taskinstance.h
+1
-1
src/libloom/unpacking.h
src/libloom/unpacking.h
+1
-0
src/libloom/worker.cpp
src/libloom/worker.cpp
+2
-2
src/server/CMakeLists.txt
src/server/CMakeLists.txt
+1
-1
src/server/dummyworker.cpp
src/server/dummyworker.cpp
+1
-0
src/server/freshconn.cpp
src/server/freshconn.cpp
+1
-0
src/server/server.cpp
src/server/server.cpp
+3
-2
src/server/server.h
src/server/server.h
+1
-1
src/server/taskmanager.cpp
src/server/taskmanager.cpp
+1
-0
src/server/tasknode.h
src/server/tasknode.h
+2
-2
src/server/workerconn.h
src/server/workerconn.h
+1
-1
src/worker/CMakeLists.txt
src/worker/CMakeLists.txt
+1
-1
src/worker/basictasks.cpp
src/worker/basictasks.cpp
+1
-0
tests/server/CMakeLists.txt
tests/server/CMakeLists.txt
+1
-1
tests/server/scheduler.cpp
tests/server/scheduler.cpp
+5
-1
No files found.
src/libloom/CMakeLists.txt
View file @
24a1c504
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++1
4
-g -Wall"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++1
1
-g -Wall"
)
add_library
(
libloom
data/externfile.cpp
data/externfile.h
...
...
@@ -27,6 +27,7 @@ add_library(libloom
loomcomm.pb.cc
loomplan.pb.h
loomplan.pb.cc
compat.h
log.h
log.cpp
types.h
...
...
src/libloom/compat.h
0 → 100644
View file @
24a1c504
#ifndef LIBLOOM_COMPAT_H
#define LIBLOOM_COMPAT_H
#include <cstddef>
#include <memory>
#include <type_traits>
#include <utility>
namespace
std
{
template
<
class
T
>
struct
_Unique_if
{
typedef
unique_ptr
<
T
>
_Single_object
;
};
template
<
class
T
>
struct
_Unique_if
<
T
[]
>
{
typedef
unique_ptr
<
T
[]
>
_Unknown_bound
;
};
template
<
class
T
,
size_t
N
>
struct
_Unique_if
<
T
[
N
]
>
{
typedef
void
_Known_bound
;
};
template
<
class
T
,
class
...
Args
>
typename
_Unique_if
<
T
>::
_Single_object
make_unique
(
Args
&&
...
args
)
{
return
unique_ptr
<
T
>
(
new
T
(
std
::
forward
<
Args
>
(
args
)...));
}
template
<
class
T
>
typename
_Unique_if
<
T
>::
_Unknown_bound
make_unique
(
size_t
n
)
{
typedef
typename
remove_extent
<
T
>::
type
U
;
return
unique_ptr
<
T
>
(
new
U
[
n
]());
}
template
<
class
T
,
class
...
Args
>
typename
_Unique_if
<
T
>::
_Known_bound
make_unique
(
Args
&&
...)
=
delete
;
}
#endif // LIBLOOM_COMPAT_H
src/libloom/sendbuffer.cpp
View file @
24a1c504
...
...
@@ -3,7 +3,7 @@
#include "utils.h"
#include "loomcomm.pb.h"
#include "compat.h"
using
namespace
loom
;
...
...
src/libloom/taskfactory.h
View file @
24a1c504
...
...
@@ -3,6 +3,7 @@
#include "data.h"
#include "task.h"
#include "compat.h"
#include<uv.h>
...
...
src/libloom/taskinstance.h
View file @
24a1c504
...
...
@@ -34,7 +34,7 @@ public:
return
task
->
get_id
();
}
const
auto
&
get_inputs
()
{
const
std
::
vector
<
Id
>
&
get_inputs
()
{
return
task
->
get_inputs
();
}
...
...
src/libloom/unpacking.h
View file @
24a1c504
...
...
@@ -2,6 +2,7 @@
#define LIBLOOM_UNPACKING_H
#include "data.h"
#include "compat.h"
#include <memory>
...
...
src/libloom/worker.cpp
View file @
24a1c504
...
...
@@ -233,7 +233,7 @@ void Worker::register_connection(InterConnection &connection)
auto
i
=
std
::
find_if
(
nonregistered_connections
.
begin
(),
nonregistered_connections
.
end
(),
[
&
](
auto
&
p
)
{
return
p
.
get
()
==
&
connection
;
});
[
&
](
std
::
unique_ptr
<
InterConnection
>
&
p
)
{
return
p
.
get
()
==
&
connection
;
});
assert
(
i
!=
nonregistered_connections
.
end
());
c
=
std
::
move
(
*
i
);
nonregistered_connections
.
erase
(
i
);
...
...
@@ -246,7 +246,7 @@ void Worker::unregister_connection(InterConnection &connection)
auto
i
=
std
::
find_if
(
nonregistered_connections
.
begin
(),
nonregistered_connections
.
end
(),
[
&
](
auto
&
p
)
{
return
p
.
get
()
==
&
connection
;
});
[
&
](
std
::
unique_ptr
<
InterConnection
>
&
p
)
{
return
p
.
get
()
==
&
connection
;
});
assert
(
i
!=
nonregistered_connections
.
end
());
nonregistered_connections
.
erase
(
i
);
return
;
...
...
src/server/CMakeLists.txt
View file @
24a1c504
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++1
4
-g -Wall"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++1
1
-g -Wall"
)
add_library
(
loom-server-lib OBJECT
server.cpp
server.h
...
...
src/server/dummyworker.cpp
View file @
24a1c504
...
...
@@ -2,6 +2,7 @@
#include "dummyworker.h"
#include "server.h"
#include <libloom/compat.h>
#include <libloom/utils.h>
#include <libloom/log.h>
#include <libloom/loomcomm.pb.h>
...
...
src/server/freshconn.cpp
View file @
24a1c504
...
...
@@ -3,6 +3,7 @@
#include "clientconn.h"
#include "server.h"
#include "libloom/compat.h"
#include "libloom/log.h"
#include "libloom/loomcomm.pb.h"
...
...
src/server/server.cpp
View file @
24a1c504
#include "server.h"
#include "resendtask.h"
#include "libloom/compat.h"
#include "libloom/utils.h"
#include "libloom/log.h"
#include "libloom/loomcomm.pb.h"
...
...
@@ -34,7 +35,7 @@ void Server::remove_worker_connection(WorkerConnection &conn)
auto
i
=
std
::
find_if
(
connections
.
begin
(),
connections
.
end
(),
[
&
](
auto
&
p
)
{
return
p
.
get
()
==
&
conn
;
}
);
[
&
](
std
::
unique_ptr
<
WorkerConnection
>
&
p
)
{
return
p
.
get
()
==
&
conn
;
}
);
assert
(
i
!=
connections
.
end
());
connections
.
erase
(
i
);
}
...
...
@@ -58,7 +59,7 @@ void Server::remove_freshconnection(FreshConnection &conn)
auto
i
=
std
::
find_if
(
fresh_connections
.
begin
(),
fresh_connections
.
end
(),
[
&
](
auto
&
p
)
{
return
p
.
get
()
==
&
conn
;
}
);
[
&
](
std
::
unique_ptr
<
FreshConnection
>
&
p
)
{
return
p
.
get
()
==
&
conn
;
}
);
assert
(
i
!=
fresh_connections
.
end
());
fresh_connections
.
erase
(
i
);
}
...
...
src/server/server.h
View file @
24a1c504
...
...
@@ -37,7 +37,7 @@ public:
return
task_manager
;
}
auto
&
get_connections
()
{
const
std
::
vector
<
std
::
unique_ptr
<
WorkerConnection
>>
&
get_connections
()
{
return
connections
;
}
...
...
src/server/taskmanager.cpp
View file @
24a1c504
#include "taskmanager.h"
#include "server.h"
#include "libloom/compat.h"
#include "libloom/loomplan.pb.h"
#include "libloom/log.h"
...
...
src/server/tasknode.h
View file @
24a1c504
...
...
@@ -75,7 +75,7 @@ public:
owners
.
push_back
(
wconn
);
}
const
auto
&
get_owners
()
const
{
const
std
::
vector
<
WorkerConnection
*>
&
get_owners
()
const
{
return
owners
;
}
...
...
@@ -88,7 +88,7 @@ public:
state
=
FINISHED
;
}
const
auto
&
get_inputs
()
{
const
Vector
&
get_inputs
()
{
return
inputs
;
}
...
...
src/server/workerconn.h
View file @
24a1c504
...
...
@@ -24,7 +24,7 @@ public:
void
send_task
(
TaskNode
*
task
);
void
send_data
(
loom
::
Id
id
,
const
std
::
string
&
address
,
bool
with_size
);
auto
&
get_tasks
()
{
std
::
unordered_map
<
loom
::
Id
,
TaskNode
*>
&
get_tasks
()
{
return
tasks
;
}
...
...
src/worker/CMakeLists.txt
View file @
24a1c504
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++1
4
-g -Wall"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++1
1
-g -Wall"
)
add_executable
(
loom-worker
loomrun.pb.cc
loomrun.pb.h
...
...
src/worker/basictasks.cpp
View file @
24a1c504
#include "basictasks.h"
#include "libloom/compat.h"
#include "libloom/databuilder.h"
#include "libloom/data/rawdata.h"
#include "libloom/data/externfile.h"
...
...
tests/server/CMakeLists.txt
View file @
24a1c504
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++1
4
-g -Wall"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++1
1
-g -Wall"
)
add_library
(
Catch INTERFACE
)
target_include_directories
(
Catch INTERFACE
${
PROJECT_SOURCE_DIR
}
/tests
)
...
...
tests/server/scheduler.cpp
View file @
24a1c504
#include "catch/catch.hpp"
#include <uv.h>
#include "src/server/server.h"
#include "libloom/compat.h"
#include "libloom/loomplan.pb.h"
#include <uv.h>
typedef
std
::
unordered_set
<
TaskNode
*>
TaskSet
;
typedef
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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