Commit 241c1a2
committed
Add send-timeout API and honor commandPowerOn timeout
Addresses upstream review on the httplib timeout PR:
- Add setSendTimeout / getConfiguredSendTimeout to the base class
(DashboardClientImpl), mirroring the existing read-timeout API.
getConfiguredSendTimeout has a non-pure default that returns the
documented 1 s value, so DashboardClientImplG5 needs no change.
- Override both in DashboardClientImplX with a send_timeout_ member
parallel to recv_timeout_. The setter updates the underlying
httplib::Client; the getter falls back to the 10 s constructor
default until a caller configures it explicitly.
- Bump the constructor's read/write timeouts from 1 s / 5 s to
10 s / 10 s. The 1 s read default was too tight for legitimate
blocking calls (brake_release, commandLoadProgram, program
upload/update/download). The 10 s figure covers all non-power-on
commands without per-method timeouts; callers can override via
setReceiveTimeout / setSendTimeout.
- Honor the timeout parameter on commandPowerOn using the same
save-bump-restore pattern as connect(): cache the configured
read timeout, set it to the caller-supplied value for the PUT,
restore on both success and exception (catch(...) rethrow).1 parent 6e318e6 commit 241c1a2
3 files changed
Lines changed: 90 additions & 11 deletions
File tree
- include/ur_client_library/ur
- src/ur
Lines changed: 21 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
138 | 159 | | |
139 | 160 | | |
140 | 161 | | |
| |||
Lines changed: 6 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
164 | 164 | | |
165 | 165 | | |
166 | 166 | | |
| 167 | + | |
| 168 | + | |
167 | 169 | | |
168 | 170 | | |
169 | 171 | | |
| |||
184 | 186 | | |
185 | 187 | | |
186 | 188 | | |
187 | | - | |
188 | | - | |
189 | | - | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
190 | 192 | | |
| 193 | + | |
191 | 194 | | |
192 | 195 | | |
193 | 196 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | | - | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
58 | 63 | | |
59 | | - | |
60 | | - | |
| 64 | + | |
| 65 | + | |
61 | 66 | | |
62 | 67 | | |
63 | 68 | | |
| |||
69 | 74 | | |
70 | 75 | | |
71 | 76 | | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
72 | 86 | | |
73 | 87 | | |
74 | 88 | | |
| |||
134 | 148 | | |
135 | 149 | | |
136 | 150 | | |
137 | | - | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
138 | 154 | | |
139 | 155 | | |
140 | 156 | | |
141 | 157 | | |
142 | 158 | | |
143 | 159 | | |
144 | 160 | | |
145 | | - | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
146 | 178 | | |
147 | 179 | | |
148 | 180 | | |
| |||
196 | 228 | | |
197 | 229 | | |
198 | 230 | | |
199 | | - | |
| 231 | + | |
200 | 232 | | |
201 | | - | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
202 | 257 | | |
203 | 258 | | |
204 | 259 | | |
| |||
0 commit comments