Skip to content

Commit d46bfaf

Browse files
committed
优化-规范化命名
优化-规范化命名
1 parent 3017c9d commit d46bfaf

File tree

4 files changed

+14
-21
lines changed

4 files changed

+14
-21
lines changed

public/cpp/actor/actor_base/actor_client.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,8 @@ namespace ngl
293293

294294
if (nconfig::m_nodetype != NODE_TYPE::ROBOT)
295295
{
296-
auto pro = std::make_shared<np_actornode_update_server>();
297-
pro->m_data = lparm->m_mass;
298-
pro->m_data.m_actorservermass = true;
296+
auto pro = std::make_shared<np_actornode_update>();
297+
*pro = lparm->m_mass;
299298
send_actor(actor_server::actorid(), pro);
300299
}
301300

public/cpp/actor/actor_base/actor_manage.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ namespace ngl
113113
{
114114
.m_id = nconfig::m_nodeid,
115115
.m_add = {guid},
116-
.m_actorservermass = false
117116
};
118117
pro->m_fun = afun;
119118
nguid lguid = nodetypebyguid();

public/cpp/actor/actor_base/actor_server.cpp

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -131,23 +131,20 @@ namespace ngl
131131
const i32_serverid lserverid = lpack->m_id;
132132
naddress::actor_add(lserverid, lrecv->m_data.m_add);
133133
naddress::actor_del(lrecv->m_data.m_del);
134-
if (lrecv->m_data.m_actorservermass)
135-
{
136-
// # 分发给其他结点
137-
std::vector<i32_sessionid> lvec;
138-
naddress::foreach([lserverid, &lvec](const actor_node_session& anode)->bool
134+
// # 分发给其他结点
135+
std::vector<i32_sessionid> lvec;
136+
naddress::foreach([lserverid, &lvec](const actor_node_session& anode)->bool
137+
{
138+
if (anode.m_node.m_serverid != lserverid)
139139
{
140-
if (anode.m_node.m_serverid != lserverid)
141-
{
142-
lvec.push_back(anode.m_session);
143-
}
144-
return true;
140+
lvec.push_back(anode.m_session);
145141
}
146-
);
147-
if (!lvec.empty())
148-
{
149-
nets::sendmore(lvec, lrecv->m_data, nguid::moreactor(), id_guid());
142+
return true;
150143
}
144+
);
145+
if (!lvec.empty())
146+
{
147+
nets::sendmore(lvec, lrecv->m_data, nguid::moreactor(), id_guid());
151148
}
152149
}Catch
153150
return true;

public/cpp/actor/nprotocol.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,13 @@ namespace ngl
9696

9797
// ---- [actor server -> actor client] [actor client -> actor server]
9898
// ---- 服务器向客户端同步结点信息 客户端向服务器同步结点信息
99-
// 向actor客户端同步结点信息
10099
struct np_actornode_update
101100
{
102101
i32_serverid m_id = -1; // 服务器id
103102
std::vector<i64_actorid> m_add;
104103
std::vector<i64_actorid> m_del;
105-
bool m_actorservermass = true; // 是否给actorclient进行广播
106104

107-
def_portocol(np_actornode_update, m_id, m_add, m_del, m_actorservermass)
105+
def_portocol(np_actornode_update, m_id, m_add, m_del)
108106
};
109107

110108
struct np_actornode_update_server

0 commit comments

Comments
 (0)