Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
colorEagleStdio
zoompipeline
提交
14350d1c
zoompipeline
项目概览
colorEagleStdio
/
zoompipeline
通知
181
Star
12
Fork
4
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
zoompipeline
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
14350d1c
编写于
3月 12, 2014
作者:
丁劲犇
😸
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into smartlink_svr
上级
4d1f04d1
745bd500
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
227 addition
and
79 deletion
+227
-79
ZoomPipeline_FuncSvr/cluster/zp_clusterterm.cpp
ZoomPipeline_FuncSvr/cluster/zp_clusterterm.cpp
+19
-16
ZoomPipeline_FuncSvr/cluster/zp_clusterterm.h
ZoomPipeline_FuncSvr/cluster/zp_clusterterm.h
+24
-28
ZoomPipeline_FuncSvr/zpmainframe.cpp
ZoomPipeline_FuncSvr/zpmainframe.cpp
+43
-0
ZoomPipeline_FuncSvr/zpmainframe.h
ZoomPipeline_FuncSvr/zpmainframe.h
+5
-0
ZoomPipeline_FuncSvr/zpmainframe.ui
ZoomPipeline_FuncSvr/zpmainframe.ui
+136
-35
未找到文件。
ZoomPipeline_FuncSvr/cluster/zp_clusterterm.cpp
浏览文件 @
14350d1c
#include "zp_clusterterm.h"
namespace
ZP_Cluster
{
zp_ClusterTerm
::
zp_ClusterTerm
(
const
QString
&
name
,
int
nTransThreads
,
QObject
*
parent
)
:
zp_ClusterTerm
::
zp_ClusterTerm
(
const
QString
&
name
,
QObject
*
parent
)
:
QObject
(
parent
)
,
m_strTermName
(
name
)
{
{
m_pClusterEng
=
new
ZPTaskEngine
::
zp_pipeline
(
this
);
m_pClusterNet
=
new
ZPNetwork
::
zp_net_ThreadPool
(
8192
,
this
);
m_pClusterEng
->
addThreads
(
nTransThreads
);
}
void
zp_ClusterTerm
::
StartListen
(
const
QHostAddress
&
addr
,
int
nPort
)
{
}
void
zp_ClusterTerm
::
StartListen
(
const
QHostAddress
&
addr
,
int
nPort
)
{
m_pClusterNet
->
AddListeningAddress
(
m_strTermName
,
addr
,
nPort
,
false
);
}
bool
zp_ClusterTerm
::
JoinCluster
(
const
QHostAddress
&
addr
,
int
nPort
)
{
}
bool
zp_ClusterTerm
::
JoinCluster
(
const
QHostAddress
&
addr
,
int
nPort
)
{
return
m_pClusterNet
->
connectTo
(
addr
,
nPort
);
}
}
bool
zp_ClusterTerm
::
canExit
()
{
return
m_pClusterEng
->
canClose
()
&&
m_pClusterNet
->
CanExit
();
}
}
ZoomPipeline_FuncSvr/cluster/zp_clusterterm.h
浏览文件 @
14350d1c
...
...
@@ -8,28 +8,24 @@
#include "../pipeline/zp_pltaskbase.h"
namespace
ZP_Cluster
{
//!this class enable server processes can
//! communicate with each other.
class
zp_ClusterTerm
:
public
QObject
{
//!this class enable server processes can
//! communicate with each other.
class
zp_ClusterTerm
:
public
QObject
{
Q_OBJECT
public:
explicit
zp_ClusterTerm
(
const
QString
&
name
,
int
nTransThreads
=
4
,
QObject
*
parent
=
0
);
public:
explicit
zp_ClusterTerm
(
const
QString
&
name
,
QObject
*
parent
=
0
);
//cluster status
bool
isListening
(){
return
m_pClusterNet
->
ListenerNames
().
size
()
==
0
?
false
:
true
;}
const
QString
&
name
()
{
return
m_strTermName
;}
int
transThreads
(){
return
m_pClusterNet
->
TransThreadNum
();
}
int
transClients
(
int
idx
){
return
m_pClusterNet
->
totalClients
(
idx
);}
int
payload
(){
return
m_pClusterEng
->
payload
();}
int
threadsCount
(){
return
m_pClusterEng
->
threadsCount
();}
int
threadsIdel
(){
return
m_pClusterEng
->
idleThreads
();}
protected:
ZPNetwork
::
zp_net_ThreadPool
*
netEng
()
{
return
m_pClusterNet
;}
ZPTaskEngine
::
zp_pipeline
*
taskEng
()
{
return
m_pClusterEng
;}
bool
canExit
();
protected:
QString
m_strTermName
;
//the Terminal's name
ZPNetwork
::
zp_net_ThreadPool
*
m_pClusterNet
;
ZPTaskEngine
::
zp_pipeline
*
m_pClusterEng
;
signals:
signals:
public
slots
:
public
slots
:
//!Start listen, this term can be connected by newly joined terms in future.
void
StartListen
(
const
QHostAddress
&
addr
,
int
nPort
);
//!Join cluster, using existing term (addr:nPort)
...
...
@@ -37,6 +33,6 @@ public slots:
//!an p2p connection will start
bool
JoinCluster
(
const
QHostAddress
&
addr
,
int
nPort
);
};
};
}
#endif // ZP_CLUSTERTERM_H
ZoomPipeline_FuncSvr/zpmainframe.cpp
浏览文件 @
14350d1c
...
...
@@ -9,6 +9,7 @@
#include <QMap>
using
namespace
ZPNetwork
;
using
namespace
ZPTaskEngine
;
using
namespace
ZP_Cluster
;
ZPMainFrame
::
ZPMainFrame
(
QWidget
*
parent
)
:
QMainWindow
(
parent
),
ui
(
new
Ui
::
ZPMainFrame
)
...
...
@@ -22,6 +23,10 @@ ZPMainFrame::ZPMainFrame(QWidget *parent) :
connect
(
m_netEngine
,
&
zp_net_ThreadPool
::
evt_SocketError
,
this
,
&
ZPMainFrame
::
on_evt_SocketError
);
//Create TaskEngine
m_taskEngine
=
new
zp_pipeline
(
this
);
//Cluster is not created
m_pClusterTerm
=
0
;
//Create databases
m_pDatabases
=
new
ZPDatabase
::
DatabaseResource
(
this
);
connect
(
m_pDatabases
,
&
ZPDatabase
::
DatabaseResource
::
evt_Message
,
this
,
&
ZPMainFrame
::
on_evt_Message
);
...
...
@@ -291,6 +296,7 @@ void ZPMainFrame::forkServer(const QString & config_file)
}
//Smartlink settings
int
nHeartbeatingThreadhold
=
settings
.
value
(
"Smartlink/HeartbeatingThreadhold"
,
180
).
toInt
();
if
(
nHeartbeatingThreadhold
>=
60
&&
nHeartbeatingThreadhold
<=
300
)
...
...
@@ -409,6 +415,23 @@ void ZPMainFrame::LoadSettings(const QString & config_file)
QString
strSL_LargetFolder
=
settings
.
value
(
"Smartlink/SL_LargetFolder"
,
"NUL"
).
toString
();
ui
->
lineEdit_SL_LargetFolder
->
setText
(
strSL_LargetFolder
);
//Cluster
QString
strClusterTermAddr
=
settings
.
value
(
"Cluster/strClusterTermAddr"
,
"0.0.0.0"
).
toString
();
ui
->
lineEdit_cluster_term_addr
->
setText
(
strClusterTermAddr
);
QString
strClusterTermPort
=
settings
.
value
(
"Cluster/strClusterTermPort"
,
"25600"
).
toString
();
ui
->
lineEdit_cluster_term_port
->
setText
(
strClusterTermPort
);
QString
strClusterPubName
=
settings
.
value
(
"Cluster/strClusterPubName"
,
"Term 001"
).
toString
();
ui
->
lineEdit_cluster_pub_name
->
setText
(
strClusterPubName
);
QString
strClusterPubAddr
=
settings
.
value
(
"Cluster/strClusterPubAddr"
,
"192.168.1.111"
).
toString
();
ui
->
lineEdit_cluster_pub_Addr
->
setText
(
strClusterPubAddr
);
QString
strClusterPubPort
=
settings
.
value
(
"Cluster/strClusterPubPort"
,
"25600"
).
toString
();
ui
->
lineEdit_cluster_pub_Port
->
setText
(
strClusterPubPort
);
int
nClusterTransThreads
=
settings
.
value
(
"Cluster/nClusterTransThreads"
,
"4"
).
toInt
();
ui
->
horizontalSlider_cluster_transThreads
->
setValue
(
nClusterTransThreads
);
int
nClusterWorkingThreads
=
settings
.
value
(
"Cluster/nClusterWorkingThreads"
,
"4"
).
toInt
();
ui
->
horizontalSlider_cluster_workingThread
->
setValue
(
nClusterWorkingThreads
);
}
...
...
@@ -480,6 +503,16 @@ void ZPMainFrame::SaveSettings(const QString & config_file)
settings
.
setValue
(
"Smartlink/SLDB_mainEvt"
,
strSLDB_mainEvent
);
QString
strSL_LargetFolder
=
ui
->
lineEdit_SL_LargetFolder
->
text
();
settings
.
setValue
(
"Smartlink/SL_LargetFolder"
,
strSL_LargetFolder
);
//Cluster
settings
.
setValue
(
"Cluster/strClusterTermAddr"
,
ui
->
lineEdit_cluster_term_addr
->
text
());
settings
.
setValue
(
"Cluster/strClusterTermPort"
,
ui
->
lineEdit_cluster_term_port
->
text
());
settings
.
setValue
(
"Cluster/strClusterPubName"
,
ui
->
lineEdit_cluster_pub_name
->
text
());
settings
.
setValue
(
"Cluster/strClusterPubAddr"
,
ui
->
lineEdit_cluster_pub_Addr
->
text
());
settings
.
setValue
(
"Cluster/strClusterPubPort"
,
ui
->
lineEdit_cluster_pub_Port
->
text
());
settings
.
setValue
(
"Cluster/nClusterTransThreads"
,
ui
->
horizontalSlider_cluster_transThreads
->
value
());
settings
.
setValue
(
"Cluster/nClusterWorkingThreads"
,
ui
->
horizontalSlider_cluster_workingThread
->
value
());
}
void
ZPMainFrame
::
on_pushButton_addListener_clicked
()
{
...
...
@@ -532,6 +565,16 @@ void ZPMainFrame::on_pushButton_threadsApply_clicked()
{
SaveSettings
(
m_currentConffile
);
}
void
ZPMainFrame
::
on_pushButton_cluster_apply_clicked
()
{
SaveSettings
(
m_currentConffile
);
}
void
ZPMainFrame
::
on_pushButton_smartlink_save_clicked
()
{
SaveSettings
(
m_currentConffile
);
}
void
ZPMainFrame
::
on_actionReload_config_file_triggered
()
{
QString
filename
=
QFileDialog
::
getOpenFileName
(
this
,
tr
(
"Open Conf file"
),
QCoreApplication
::
applicationDirPath
(),
...
...
ZoomPipeline_FuncSvr/zpmainframe.h
浏览文件 @
14350d1c
...
...
@@ -9,6 +9,7 @@
#include "pipeline/zp_pipeline.h"
#include "smartlink/st_client_table.h"
#include "database/databaseresource.h"
#include "cluster/zp_clusterterm.h"
namespace
Ui
{
class
ZPMainFrame
;
}
...
...
@@ -45,6 +46,7 @@ private:
ZPTaskEngine
::
zp_pipeline
*
m_taskEngine
;
SmartLink
::
st_client_table
*
m_clientTable
;
ZPDatabase
::
DatabaseResource
*
m_pDatabases
;
ZP_Cluster
::
zp_ClusterTerm
*
m_pClusterTerm
;
int
m_nTimerId
;
void
initUI
();
void
LoadSettings
(
const
QString
&
config_file
);
...
...
@@ -68,6 +70,9 @@ public slots:
void
on_pushButton_db_del_clicked
();
void
on_pushButton_db_apply_clicked
();
void
on_pushButton_cluster_apply_clicked
();
void
on_pushButton_smartlink_save_clicked
();
};
#endif // ZPMAINFRAME_H
ZoomPipeline_FuncSvr/zpmainframe.ui
浏览文件 @
14350d1c
...
...
@@ -486,6 +486,10 @@
<property
name=
"text"
>
<string>
Save
</string>
</property>
<property
name=
"icon"
>
<iconset
resource=
"resource.qrc"
>
<normaloff>
:/icons/Resources/Color, Sage.png
</normaloff>
:/icons/Resources/Color, Sage.png
</iconset>
</property>
</widget>
</item>
</layout>
...
...
@@ -506,7 +510,7 @@
<item>
<widget
class=
"QLabel"
name=
"label_20"
>
<property
name=
"text"
>
<string>
Terminal Address
</string>
<string>
Terminal
Listen
Address
</string>
</property>
</widget>
</item>
...
...
@@ -516,7 +520,7 @@
<item>
<widget
class=
"QLabel"
name=
"label_19"
>
<property
name=
"text"
>
<string>
Terminal
Port
</string>
<string>
Listen
Port
</string>
</property>
</widget>
</item>
...
...
@@ -539,17 +543,82 @@
</layout>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_1
3
"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_1
6
"
>
<item>
<widget
class=
"QLabel"
name=
"label_2
3
"
>
<widget
class=
"QLabel"
name=
"label_2
4
"
>
<property
name=
"text"
>
<string>
Publish Name
</string>
<string>
TransThreads
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLineEdit"
name=
"lineEdit_cluster_pub_name"
/>
<widget
class=
"QSlider"
name=
"horizontalSlider_cluster_transThreads"
>
<property
name=
"minimum"
>
<number>
1
</number>
</property>
<property
name=
"maximum"
>
<number>
16
</number>
</property>
<property
name=
"pageStep"
>
<number>
1
</number>
</property>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"tickPosition"
>
<enum>
QSlider::TicksAbove
</enum>
</property>
</widget>
</item>
<item>
<widget
class=
"QLabel"
name=
"label_25"
>
<property
name=
"text"
>
<string>
Working Threads
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QSlider"
name=
"horizontalSlider_cluster_workingThread"
>
<property
name=
"minimum"
>
<number>
1
</number>
</property>
<property
name=
"maximum"
>
<number>
16
</number>
</property>
<property
name=
"pageStep"
>
<number>
1
</number>
</property>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"tickPosition"
>
<enum>
QSlider::TicksAbove
</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget
class=
"QGroupBox"
name=
"groupBox"
>
<property
name=
"title"
>
<string>
Active Terminals
</string>
</property>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_14"
>
<item>
<widget
class=
"QListView"
name=
"listView_activeTerms"
>
<property
name=
"movement"
>
<enum>
QListView::Static
</enum>
</property>
<property
name=
"viewMode"
>
<enum>
QListView::IconMode
</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_13"
>
<item>
<widget
class=
"QLabel"
name=
"label_21"
>
<property
name=
"text"
>
...
...
@@ -571,14 +640,34 @@
<widget
class=
"QLineEdit"
name=
"lineEdit_cluster_pub_Port"
/>
</item>
<item>
<widget
class=
"QPushButton"
name=
"pushButton_cluster_apply"
>
<spacer
name=
"horizontalSpacer_7"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
40
</width>
<height>
20
</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_17"
>
<item>
<widget
class=
"QLabel"
name=
"label_23"
>
<property
name=
"text"
>
<string>
&
Sav
e
</string>
<string>
Publish Nam
e
</string>
</property>
</widget>
</item>
<item>
<spacer
name=
"horizontalSpacer_7"
>
<widget
class=
"QLineEdit"
name=
"lineEdit_cluster_pub_name"
/>
</item>
<item>
<spacer
name=
"horizontalSpacer_9"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
...
...
@@ -590,26 +679,21 @@
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget
class=
"QGroupBox"
name=
"groupBox
"
>
<property
name=
"title
"
>
<string>
Active Terminals
</string>
<widget
class=
"QPushButton"
name=
"pushButton_cluster_apply
"
>
<property
name=
"text
"
>
<string>
&
Save
</string>
</property>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_14"
>
</widget>
</item>
<item>
<widget
class=
"QListView"
name=
"listView_activeTerms"
>
<property
name=
"movement"
>
<enum>
QListView::Static
</enum>
</property>
<property
name=
"viewMode"
>
<enum>
QListView::IconMode
</enum>
<widget
class=
"QPushButton"
name=
"pushButton_join"
>
<property
name=
"text"
>
<string>
Participate
</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
...
...
@@ -624,13 +708,6 @@
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_5"
>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_9"
>
<item>
<widget
class=
"QPushButton"
name=
"pushButton_smartlink_save"
>
<property
name=
"text"
>
<string>
&
Save
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLabel"
name=
"label"
>
<property
name=
"text"
>
...
...
@@ -737,6 +814,30 @@
</property>
</spacer>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_15"
>
<item>
<spacer
name=
"horizontalSpacer_8"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
40
</width>
<height>
20
</height>
</size>
</property>
</spacer>
</item>
<item>
<widget
class=
"QPushButton"
name=
"pushButton_smartlink_save"
>
<property
name=
"text"
>
<string>
&
Save
</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录