Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
镜像
Eclipse Foundation
paho.mqtt.python
提交
3ae20665
P
paho.mqtt.python
项目概览
镜像
/
Eclipse Foundation
/
paho.mqtt.python
11 个月 前同步成功
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
paho.mqtt.python
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3ae20665
编写于
9月 16, 2014
作者:
R
Roger A. Light
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplify message states.
Change-Id: Ic81bcceed68303216402ce755dbc38380174965a
上级
849f7433
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
21 deletion
+16
-21
src/paho/mqtt/client.py
src/paho/mqtt/client.py
+16
-21
未找到文件。
src/paho/mqtt/client.py
浏览文件 @
3ae20665
...
@@ -100,18 +100,16 @@ mqtt_cs_disconnecting = 2
...
@@ -100,18 +100,16 @@ mqtt_cs_disconnecting = 2
mqtt_cs_connect_async
=
3
mqtt_cs_connect_async
=
3
# Message state
# Message state
mqtt_ms_invalid
=
0
,
mqtt_ms_invalid
=
0
mqtt_ms_publish_qos0
=
1
mqtt_ms_publish
=
1
mqtt_ms_publish_qos1
=
2
mqtt_ms_wait_for_puback
=
2
mqtt_ms_wait_for_puback
=
3
mqtt_ms_wait_for_pubrec
=
3
mqtt_ms_publish_qos2
=
4
mqtt_ms_resend_pubrel
=
4
mqtt_ms_wait_for_pubrec
=
5
mqtt_ms_wait_for_pubrel
=
5
mqtt_ms_resend_pubrel
=
6
mqtt_ms_resend_pubcomp
=
6
mqtt_ms_wait_for_pubrel
=
7
mqtt_ms_wait_for_pubcomp
=
7
mqtt_ms_resend_pubcomp
=
8
mqtt_ms_send_pubrec
=
8
mqtt_ms_wait_for_pubcomp
=
9
mqtt_ms_queued
=
9
mqtt_ms_send_pubrec
=
10
mqtt_ms_queued
=
11
# Error values
# Error values
MQTT_ERR_AGAIN
=
-
1
MQTT_ERR_AGAIN
=
-
1
...
@@ -914,10 +912,7 @@ class Client(object):
...
@@ -914,10 +912,7 @@ class Client(object):
if
rc
is
MQTT_ERR_NO_CONN
:
if
rc
is
MQTT_ERR_NO_CONN
:
with
self
.
_out_message_mutex
:
with
self
.
_out_message_mutex
:
self
.
_inflight_messages
-=
1
self
.
_inflight_messages
-=
1
if
qos
==
1
:
message
.
state
=
mqtt_ms_publish
message
.
state
=
mqtt_ms_publish_qos1
elif
qos
==
2
:
message
.
state
=
mqtt_ms_publish_qos2
return
(
rc
,
local_mid
)
return
(
rc
,
local_mid
)
else
:
else
:
...
@@ -1850,12 +1845,12 @@ class Client(object):
...
@@ -1850,12 +1845,12 @@ class Client(object):
m
.
timestamp
=
0
m
.
timestamp
=
0
if
self
.
_max_inflight_messages
==
0
or
self
.
_inflight_messages
<
self
.
_max_inflight_messages
:
if
self
.
_max_inflight_messages
==
0
or
self
.
_inflight_messages
<
self
.
_max_inflight_messages
:
if
m
.
qos
==
0
:
if
m
.
qos
==
0
:
m
.
state
=
mqtt_ms_publish
_qos0
m
.
state
=
mqtt_ms_publish
elif
m
.
qos
==
1
:
elif
m
.
qos
==
1
:
#self._inflight_messages = self._inflight_messages + 1
#self._inflight_messages = self._inflight_messages + 1
if
m
.
state
==
mqtt_ms_wait_for_puback
:
if
m
.
state
==
mqtt_ms_wait_for_puback
:
m
.
dup
=
True
m
.
dup
=
True
m
.
state
=
mqtt_ms_publish
_qos1
m
.
state
=
mqtt_ms_publish
elif
m
.
qos
==
2
:
elif
m
.
qos
==
2
:
#self._inflight_messages = self._inflight_messages + 1
#self._inflight_messages = self._inflight_messages + 1
if
m
.
state
==
mqtt_ms_wait_for_pubcomp
:
if
m
.
state
==
mqtt_ms_wait_for_pubcomp
:
...
@@ -1864,7 +1859,7 @@ class Client(object):
...
@@ -1864,7 +1859,7 @@ class Client(object):
else
:
else
:
if
m
.
state
==
mqtt_ms_wait_for_pubrec
:
if
m
.
state
==
mqtt_ms_wait_for_pubrec
:
m
.
dup
=
True
m
.
dup
=
True
m
.
state
=
mqtt_ms_publish
_qos2
m
.
state
=
mqtt_ms_publish
else
:
else
:
m
.
state
=
mqtt_ms_queued
m
.
state
=
mqtt_ms_queued
self
.
_out_message_mutex
.
release
()
self
.
_out_message_mutex
.
release
()
...
@@ -2010,7 +2005,7 @@ class Client(object):
...
@@ -2010,7 +2005,7 @@ class Client(object):
self
.
_out_message_mutex
.
release
()
self
.
_out_message_mutex
.
release
()
return
rc
return
rc
elif
m
.
qos
==
1
:
elif
m
.
qos
==
1
:
if
m
.
state
==
mqtt_ms_publish
_qos1
:
if
m
.
state
==
mqtt_ms_publish
:
self
.
_inflight_messages
=
self
.
_inflight_messages
+
1
self
.
_inflight_messages
=
self
.
_inflight_messages
+
1
m
.
state
=
mqtt_ms_wait_for_puback
m
.
state
=
mqtt_ms_wait_for_puback
rc
=
self
.
_send_publish
(
m
.
mid
,
m
.
topic
,
m
.
payload
,
m
.
qos
,
m
.
retain
,
m
.
dup
)
rc
=
self
.
_send_publish
(
m
.
mid
,
m
.
topic
,
m
.
payload
,
m
.
qos
,
m
.
retain
,
m
.
dup
)
...
@@ -2018,7 +2013,7 @@ class Client(object):
...
@@ -2018,7 +2013,7 @@ class Client(object):
self
.
_out_message_mutex
.
release
()
self
.
_out_message_mutex
.
release
()
return
rc
return
rc
elif
m
.
qos
==
2
:
elif
m
.
qos
==
2
:
if
m
.
state
==
mqtt_ms_publish
_qos2
:
if
m
.
state
==
mqtt_ms_publish
:
self
.
_inflight_messages
=
self
.
_inflight_messages
+
1
self
.
_inflight_messages
=
self
.
_inflight_messages
+
1
m
.
state
=
mqtt_ms_wait_for_pubrec
m
.
state
=
mqtt_ms_wait_for_pubrec
rc
=
self
.
_send_publish
(
m
.
mid
,
m
.
topic
,
m
.
payload
,
m
.
qos
,
m
.
retain
,
m
.
dup
)
rc
=
self
.
_send_publish
(
m
.
mid
,
m
.
topic
,
m
.
payload
,
m
.
qos
,
m
.
retain
,
m
.
dup
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录