Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
950e0735
milvus
项目概览
BaiXuePrincess
/
milvus
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
4
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
950e0735
编写于
8月 15, 2019
作者:
W
wxyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
MS-357 Add minimum schedule function
Former-commit-id: b289ccc81dcffc7afa226185d51ae48da37fd3a9
上级
3bec8a1a
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
66 addition
and
28 deletion
+66
-28
cpp/CHANGELOG.md
cpp/CHANGELOG.md
+1
-0
cpp/src/scheduler/Cost.cpp
cpp/src/scheduler/Cost.cpp
+1
-1
cpp/src/scheduler/Cost.h
cpp/src/scheduler/Cost.h
+1
-1
cpp/src/scheduler/Scheduler.cpp
cpp/src/scheduler/Scheduler.cpp
+37
-22
cpp/src/scheduler/Scheduler.h
cpp/src/scheduler/Scheduler.h
+10
-3
cpp/src/scheduler/TaskTable.h
cpp/src/scheduler/TaskTable.h
+16
-1
未找到文件。
cpp/CHANGELOG.md
浏览文件 @
950e0735
...
...
@@ -16,6 +16,7 @@ Please mark all change in change log and use the ticket from JIRA.
-
MS-350 - Remove knowhere submodule
-
MS-354 - Add task class and interface in scheduler
-
MS-355 - Add copy interface in ExcutionEngine
-
MS-357 - Add minimum schedule function
## New Feature
-
MS-343 - Implement ResourceMgr
...
...
cpp/src/scheduler/Cost.cpp
浏览文件 @
950e0735
...
...
@@ -12,7 +12,7 @@ namespace milvus {
namespace
engine
{
std
::
vector
<
uint64_t
>
PickToMove
(
const
TaskTable
&
task_table
,
const
CacheMgr
&
cache_mgr
,
double
limit
)
{
PickToMove
(
const
TaskTable
&
task_table
,
const
CacheMgr
&
cache_mgr
,
uint64_t
limit
)
{
std
::
vector
<
uint64_t
>
indexes
;
return
indexes
;
}
...
...
cpp/src/scheduler/Cost.h
浏览文件 @
950e0735
...
...
@@ -23,7 +23,7 @@ namespace engine {
* call from scheduler;
*/
std
::
vector
<
uint64_t
>
PickToMove
(
const
TaskTable
&
task_table
,
const
CacheMgr
&
cache_mgr
,
double
limit
);
PickToMove
(
const
TaskTable
&
task_table
,
const
CacheMgr
&
cache_mgr
,
uint64_t
limit
);
/*
...
...
cpp/src/scheduler/Scheduler.cpp
浏览文件 @
950e0735
...
...
@@ -5,6 +5,7 @@
******************************************************************************/
#include "Scheduler.h"
#include "Cost.h"
namespace
zilliz
{
...
...
@@ -12,33 +13,55 @@ namespace milvus {
namespace
engine
{
void
StartUpEvent
::
Process
()
{
push_task
(
ResourcePtr
&
self
,
ResourcePtr
&
other
)
{
auto
self_task_table
=
self
->
task_table
();
auto
other_task_table
=
other
->
task_table
();
if
(
!
other_task_table
.
Empty
())
{
CacheMgr
cache
;
auto
indexes
=
PickToMove
(
self_task_table
,
cache
,
1
);
for
(
auto
index
:
indexes
)
{
if
(
self_task_table
.
Move
(
index
))
{
auto
task
=
self_task_table
.
Get
(
index
).
task
;
other_task_table
.
Put
(
task
);
// TODO: mark moved future
other
->
WakeupLoader
();
other
->
WakeupExecutor
();
}
}
}
}
void
FinishTaskEvent
::
Process
()
{
// for (nei : res->neighbours) {
// tasks = cost(nei->task_table(), nei->connection, limit = 3)
// res->task_table()->PutTasks(tasks);
// }
// res->WakeUpExec();
schedule
(
const
ResourceWPtr
&
res
)
{
if
(
auto
self
=
res
.
lock
())
{
for
(
auto
&
nei
:
self
->
GetNeighbours
())
{
if
(
auto
n
=
nei
.
neighbour_node
.
lock
())
{
auto
neighbour
=
std
::
static_pointer_cast
<
Resource
>
(
n
);
push_task
(
self
,
neighbour
);
}
}
}
}
void
CopyCompleted
Event
::
Process
()
{
StartUp
Event
::
Process
()
{
schedule
(
resource_
);
}
void
TaskTableUpdated
Event
::
Process
()
{
FinishTask
Event
::
Process
()
{
schedule
(
resource_
);
}
void
CopyCompletedEvent
::
Process
()
{
schedule
(
resource_
);
}
void
Scheduler
::
Start
()
{
worker_thread_
=
std
::
thread
(
&
Scheduler
::
worker_thread_
,
this
);
TaskTableUpdatedEvent
::
Process
()
{
schedule
(
resource_
);
}
std
::
string
...
...
@@ -46,14 +69,6 @@ Scheduler::Dump() {
return
std
::
string
();
}
void
Scheduler
::
worker_function
()
{
while
(
running_
)
{
auto
event
=
event_queue_
.
front
();
event
->
Process
();
}
}
}
}
}
cpp/src/scheduler/Scheduler.h
浏览文件 @
950e0735
...
...
@@ -27,7 +27,7 @@ public:
virtual
void
Process
()
=
0
;
pr
ivate
:
pr
otected
:
ResourceWPtr
resource_
;
};
...
...
@@ -86,7 +86,9 @@ public:
}
void
Start
();
Start
()
{
worker_thread_
=
std
::
thread
(
&
Scheduler
::
worker_thread_
,
this
);
}
public:
/******** Events ********/
...
...
@@ -138,7 +140,12 @@ private:
* Called by worker_thread_;
*/
void
worker_function
();
worker_function
()
{
while
(
running_
)
{
auto
event
=
event_queue_
.
front
();
event
->
Process
();
}
}
private:
bool
running_
;
...
...
cpp/src/scheduler/TaskTable.h
浏览文件 @
950e0735
...
...
@@ -75,7 +75,22 @@ public:
*/
void
Clear
();
/*
* Return true if task table empty, otherwise false;
*/
inline
bool
Empty
()
{
return
table_
.
empty
();
}
/*
* Return size of task table;
*/
inline
size_t
Size
()
{
return
table_
.
size
();
}
public:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录