Skip to content

Commit 6d84d8a

Browse files
committed
Change all setInterval to node.createTimer
Use the timer from rcl rather than from node.js
1 parent cad6920 commit 6d84d8a

6 files changed

Lines changed: 75 additions & 75 deletions

test/publisher_msg.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ rclnodejs.init().then(() => {
2626
msg.data = rclValue;
2727

2828
var publisher = node.createPublisher(msgType, rclType + '_channel');
29-
var timer = setInterval(() => {
29+
var timer = node.createTimer(100, () => {
3030
publisher.publish(msg);
31-
}, 100);
31+
});
3232

3333
rclnodejs.spin(node);
3434
process.on('SIGINT', (m) => {
35-
clearInterval(timer);
35+
timer.cancel();
3636
node.destroy();
3737
rclnodejs.shutdown();
3838
process.exit(0);

test/publisher_msg_colorrgba.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ rclnodejs.init().then(() => {
2727
};
2828

2929
var publisher = node.createPublisher(ColorRGBA, 'ColorRGBA_channel');
30-
var timer = setInterval(() => {
30+
var timer = node.createTimer(100, () => {
3131
publisher.publish(msg);
32-
}, 100);
32+
});
3333

3434
rclnodejs.spin(node);
3535
process.on('SIGINT', (m) => {
36-
clearInterval(timer);
36+
timer.cancel();
3737
node.destroy();
3838
rclnodejs.shutdown();
3939
process.exit(0);

test/publisher_msg_header.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ rclnodejs.init().then(() => {
3131
};
3232

3333
var publisher = node.createPublisher(Header, 'Header_channel');
34-
var timer = setInterval(() => {
34+
var timer = node.createTimer(100, () => {
3535
publisher.publish(header);
36-
}, 100);
36+
});
3737

3838
rclnodejs.spin(node);
3939
process.on('SIGINT', (m) => {
40-
clearInterval(timer);
40+
timer.cancel();
4141
node.destroy();
4242
rclnodejs.shutdown();
4343
process.exit(0);

test/publisher_msg_jointstate.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ rclnodejs.init().then(() => {
3737
};
3838

3939
var publisher = node.createPublisher(JointState, 'JointState_channel');
40-
var timer = setInterval(() => {
40+
var timer = node.createTimer(100, () => {
4141
publisher.publish(state);
42-
}, 100);
42+
});
4343

4444
rclnodejs.spin(node);
4545
process.on('SIGINT', (m) => {
46-
clearInterval(timer);
46+
timer.cancel();
4747
node.destroy();
4848
rclnodejs.shutdown();
4949
process.exit(0);

test/test-cross-lang.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ describe('Cross-language interaction', function() {
7979
var cppListener = childProcess.spawn(cppListenerPath, ['-t', 'js_cpp_chatter']);
8080
var publisher = node.createPublisher(RclString, 'js_cpp_chatter');
8181
const msg = text;
82-
var timer = setInterval(() => {
82+
var timer = node.createTimer(100, () => {
8383
publisher.publish(msg);
84-
}, 100);
84+
});
8585

8686
cppListener.stdout.on('data', (data) => {
8787
if (!destroy) {
8888
assert.ok(new RegExp(text).test(data.toString()));
89-
clearInterval(timer);
89+
timer.cancel();
9090
node.destroy();
9191
cppListener.kill('SIGINT');
9292
destroy = true;
@@ -106,13 +106,13 @@ describe('Cross-language interaction', function() {
106106
var publisher = node.createPublisher(RclString, 'js_py_chatter');
107107
var msg = text;
108108

109-
var timer = setInterval(() => {
109+
var timer = node.createTimer(100, () => {
110110
publisher.publish(msg);
111-
}, 100);
111+
});
112112
pyListener.stdout.on('data', (data) => {
113113
if (!destroy) {
114114
assert.ok(new RegExp(text).test(data.toString()));
115-
clearInterval(timer);
115+
timer.cancel();
116116
node.destroy();
117117
pyListener.kill('SIGINT');
118118
destroy = true;
@@ -133,18 +133,18 @@ describe('Cross-language interaction', function() {
133133
var client = node.createClient(AddTwoInts, 'js_py_add_two_ints');
134134
const request = {a: 1, b: 2};
135135

136-
var timer = setInterval(() => {
136+
var timer = node.createTimer(100, () => {
137137
client.sendRequest(request, (response) => {
138138
if (!destroy) {
139139
assert.deepStrictEqual(response.sum, 3);
140-
clearInterval(timer);
140+
timer.cancel();
141141
node.destroy();
142142
pyService.kill('SIGINT');
143143
destroy = true;
144144
done();
145145
}
146146
});
147-
}, 100);
147+
});
148148

149149
rclnodejs.spin(node);
150150
});

0 commit comments

Comments
 (0)