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
29e89444
Commit
29e89444
authored
Aug 29, 2016
by
Stanislav Bohm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RF: Small API refactoring
parent
1239c6ca
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
24 additions
and
17 deletions
+24
-17
src/libloom/data/index.cpp
src/libloom/data/index.cpp
+2
-2
src/libloom/data/rawdata.cpp
src/libloom/data/rawdata.cpp
+9
-2
src/libloom/data/rawdata.h
src/libloom/data/rawdata.h
+2
-1
src/libloom/taskinstance.cpp
src/libloom/taskinstance.cpp
+1
-1
src/libloom/taskinstance.h
src/libloom/taskinstance.h
+2
-1
src/libloom/tasks/basetasks.cpp
src/libloom/tasks/basetasks.cpp
+2
-2
src/libloom/tasks/rawdatatasks.cpp
src/libloom/tasks/rawdatatasks.cpp
+4
-6
src/libloom/worker.cpp
src/libloom/worker.cpp
+1
-1
src/libloom/worker.h
src/libloom/worker.h
+1
-1
No files found.
src/libloom/data/index.cpp
View file @
29e89444
...
...
@@ -48,7 +48,7 @@ std::shared_ptr<Data> Index::get_at_index(size_t index)
size_t
size
=
indices
[
index
+
1
]
-
addr
;
auto
data
=
std
::
make_shared
<
RawData
>
();
data
->
init_empty
_file
(
worker
,
size
);
data
->
init_empty
(
worker
,
size
);
char
*
p2
=
data
->
get_raw_data
(
worker
);
memcpy
(
p2
,
p1
,
size
);
return
data
;
...
...
@@ -77,7 +77,7 @@ std::shared_ptr<Data> Index::get_slice(size_t from, size_t to)
size_t
size
=
to_addr
-
from_addr
;
auto
data
=
std
::
make_shared
<
RawData
>
();
data
->
init_empty
_file
(
worker
,
size
);
data
->
init_empty
(
worker
,
size
);
char
*
p2
=
data
->
get_raw_data
(
worker
);
memcpy
(
p2
,
p1
,
size
);
return
data
;
...
...
src/libloom/data/rawdata.cpp
View file @
29e89444
...
...
@@ -51,7 +51,7 @@ std::string RawData::get_type_name() const
return data;
}*/
char
*
RawData
::
init_empty
_file
(
Worker
&
worker
,
size_t
size
)
char
*
RawData
::
init_empty
(
Worker
&
worker
,
size_t
size
)
{
assert
(
data
==
nullptr
);
...
...
@@ -141,6 +141,13 @@ std::string RawData::get_info()
return
"RawData"
;
}
void
RawData
::
init_from_string
(
Worker
&
worker
,
const
std
::
string
&
str
)
{
auto
size
=
str
.
size
();
char
*
mem
=
init_empty
(
worker
,
size
);
memcpy
(
mem
,
str
.
c_str
(),
size
);
}
void
RawData
::
serialize_data
(
Worker
&
worker
,
SendBuffer
&
buffer
,
std
::
shared_ptr
<
Data
>
&
data_ptr
)
{
buffer
.
add
(
data_ptr
,
get_raw_data
(
worker
),
size
);
...
...
@@ -156,7 +163,7 @@ bool RawDataUnpacker::init(Worker &worker, Connection &connection, const loomcom
this
->
data
=
std
::
make_shared
<
RawData
>
();
RawData
&
data
=
static_cast
<
RawData
&>
(
*
this
->
data
);
size_t
size
=
msg
.
size
();
pointer
=
data
.
init_empty
_file
(
worker
,
size
);
pointer
=
data
.
init_empty
(
worker
,
size
);
if
(
size
==
0
)
{
return
true
;
}
...
...
src/libloom/data/rawdata.h
View file @
29e89444
...
...
@@ -27,7 +27,8 @@ public:
std
::
string
get_info
();
char
*
init_empty_file
(
Worker
&
worker
,
size_t
size
);
char
*
init_empty
(
Worker
&
worker
,
size_t
size
);
void
init_from_string
(
Worker
&
worker
,
const
std
::
string
&
str
);
void
assign_filename
(
Worker
&
worker
);
void
init_from_file
(
Worker
&
worker
);
...
...
src/libloom/taskinstance.cpp
View file @
29e89444
...
...
@@ -43,7 +43,7 @@ void TaskInstance::fail_libuv(const std::string &error_msg, int error_code)
fail
(
s
.
str
());
}
void
TaskInstance
::
finish
(
std
::
shared_ptr
<
Data
>
&
output
)
void
TaskInstance
::
finish
(
const
std
::
shared_ptr
<
Data
>
&
output
)
{
assert
(
output
);
worker
.
publish_data
(
get_id
(),
output
);
...
...
src/libloom/taskinstance.h
View file @
29e89444
...
...
@@ -46,7 +46,8 @@ public:
protected:
void
fail
(
const
std
::
string
&
error_msg
);
void
fail_libuv
(
const
std
::
string
&
error_msg
,
int
error_code
);
void
finish
(
std
::
shared_ptr
<
Data
>
&
output
);
void
finish
(
const
std
::
shared_ptr
<
Data
>
&
output
);
Worker
&
worker
;
std
::
unique_ptr
<
Task
>
task
;
...
...
src/libloom/tasks/basetasks.cpp
View file @
29e89444
...
...
@@ -34,7 +34,7 @@ void SizeTask::start(DataVector &inputs)
}
std
::
shared_ptr
<
Data
>
output
=
std
::
make_shared
<
RawData
>
();
RawData
&
data
=
static_cast
<
RawData
&>
(
*
output
);
memcpy
(
data
.
init_empty
_file
(
worker
,
sizeof
(
size_t
)),
&
size
,
sizeof
(
size_t
));
memcpy
(
data
.
init_empty
(
worker
,
sizeof
(
size_t
)),
&
size
,
sizeof
(
size_t
));
finish
(
output
);
}
...
...
@@ -46,6 +46,6 @@ void LengthTask::start(DataVector &inputs)
}
std
::
shared_ptr
<
Data
>
output
=
std
::
make_shared
<
RawData
>
();
RawData
&
data
=
static_cast
<
RawData
&>
(
*
output
);
memcpy
(
data
.
init_empty
_file
(
worker
,
sizeof
(
size_t
)),
&
length
,
sizeof
(
size_t
));
memcpy
(
data
.
init_empty
(
worker
,
sizeof
(
size_t
)),
&
length
,
sizeof
(
size_t
));
finish
(
output
);
}
src/libloom/tasks/rawdatatasks.cpp
View file @
29e89444
...
...
@@ -13,11 +13,9 @@ using namespace loom;
void
ConstTask
::
start
(
DataVector
&
inputs
)
{
auto
&
config
=
task
->
get_config
();
std
::
shared_ptr
<
Data
>
output
=
std
::
make_shared
<
RawData
>
();
RawData
&
data
=
static_cast
<
RawData
&>
(
*
output
);
memcpy
(
data
.
init_empty_file
(
worker
,
config
.
size
()),
config
.
c_str
(),
config
.
size
());
finish
(
output
);
auto
output
=
std
::
make_shared
<
RawData
>
();
output
->
init_from_string
(
worker
,
task
->
get_config
());
finish
(
std
::
static_pointer_cast
<
Data
>
(
output
));
}
/** If there are more then 50 input or size is bigger then 20000,
...
...
@@ -44,7 +42,7 @@ std::shared_ptr<Data> MergeTask::run() {
}
std
::
shared_ptr
<
Data
>
output
=
std
::
make_shared
<
RawData
>
();
RawData
&
data
=
static_cast
<
RawData
&>
(
*
output
);
data
.
init_empty
_file
(
worker
,
size
);
data
.
init_empty
(
worker
,
size
);
char
*
dst
=
output
->
get_raw_data
(
worker
);
for
(
auto
&
data
:
inputs
)
{
...
...
src/libloom/worker.cpp
View file @
29e89444
...
...
@@ -216,7 +216,7 @@ void Worker::start_task(std::unique_ptr<Task> task)
t->start();
}*/
void
Worker
::
publish_data
(
Id
id
,
std
::
shared_ptr
<
Data
>
&
data
)
void
Worker
::
publish_data
(
Id
id
,
const
std
::
shared_ptr
<
Data
>
&
data
)
{
llog
->
debug
(
"Publishing data id={} size={}"
,
id
,
data
->
get_size
());
public_data
[
id
]
=
data
;
...
...
src/libloom/worker.h
View file @
29e89444
...
...
@@ -67,7 +67,7 @@ public:
void
task_finished
(
TaskInstance
&
task_instance
,
Data
&
data
);
void
task_failed
(
TaskInstance
&
task_instance
,
const
std
::
string
&
error_msg
);
void
publish_data
(
Id
id
,
std
::
shared_ptr
<
Data
>
&
data
);
void
publish_data
(
Id
id
,
const
std
::
shared_ptr
<
Data
>
&
data
);
void
remove_data
(
Id
id
);
bool
has_data
(
Id
id
)
const
...
...
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