Make timeout handling consistent in the C extension

edenhill · edenhill · commit b4a989c50379 · 2020-03-06T21:09:56.000+01:00
diff --git a/confluent_kafka/src/Consumer.c b/confluent_kafka/src/Consumer.c
@@ -596,8 +596,7 @@ static PyObject *Consumer_committed (Handle *self, PyObject *args,
 		return NULL;
 
         Py_BEGIN_ALLOW_THREADS;
-        err = rd_kafka_committed(self->rk, c_parts,
-                                 tmout >= 0 ? (int)(tmout * 1000.0f) : -1);
+        err = rd_kafka_committed(self->rk, c_parts, cfl_timeout_ms(tmout));
         Py_END_ALLOW_THREADS;
 
 	if (err) {
@@ -793,7 +792,7 @@ static PyObject *Consumer_get_watermark_offsets (Handle *self, PyObject *args,
                 err = rd_kafka_query_watermark_offsets(self->rk,
                                                        tp->topic, tp->partition,
                                                        &low, &high,
-                                                       tmout >= 0 ? (int)(tmout * 1000.0f) : -1);
+                                                       cfl_timeout_ms(tmout));
                 Py_END_ALLOW_THREADS;
         }
 
@@ -844,9 +843,8 @@ static PyObject *Consumer_offsets_for_times (Handle *self, PyObject *args,
                 return NULL;
 
         Py_BEGIN_ALLOW_THREADS;
-        err = rd_kafka_offsets_for_times(self->rk,
-                                         c_parts,
-                                         tmout >= 0 ? (int)(tmout * 1000.0f) : -1);
+        err = rd_kafka_offsets_for_times(self->rk, c_parts,
+                                         cfl_timeout_ms(tmout));
         Py_END_ALLOW_THREADS;
 
         if (err) {
@@ -884,8 +882,7 @@ static PyObject *Consumer_poll (Handle *self, PyObject *args,
 
         CallState_begin(self, &cs);
 
-        rkm = rd_kafka_consumer_poll(self->rk, tmout >= 0 ?
-                                     (int)(tmout * 1000.0f) : -1);
+        rkm = rd_kafka_consumer_poll(self->rk, cfl_timeout_ms(tmout));
 
         if (!CallState_end(self, &cs)) {
                 if (rkm)
@@ -940,9 +937,8 @@ static PyObject *Consumer_consume (Handle *self, PyObject *args,
         rkmessages = malloc(num_messages * sizeof(rd_kafka_message_t *));
 
         n = (Py_ssize_t)rd_kafka_consume_batch_queue(rkqu,
-                tmout >= 0 ? (int)(tmout * 1000.0f) : -1,
-                rkmessages,
-                num_messages);
+                                                     cfl_timeout_ms(tmout),
+                                                     rkmessages, num_messages);
 
         if (!CallState_end(self, &cs)) {
                 for (i = 0; i < n; i++) {
diff --git a/confluent_kafka/src/Metadata.c b/confluent_kafka/src/Metadata.c
@@ -343,11 +343,11 @@ list_topics (Handle *self, PyObject *args, PyObject *kwargs) {
         const rd_kafka_metadata_t *metadata = NULL;
         rd_kafka_topic_t *only_rkt = NULL;
         const char *topic = NULL;
-        double timeout = -1.0f;
+        double tmout = -1.0f;
         static char *kws[] = {"topic", "timeout", NULL};
 
         if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|zd", kws,
-                                         &topic, &timeout))
+                                         &topic, &tmout))
                 return NULL;
 
         if (topic != NULL) {
@@ -364,7 +364,7 @@ list_topics (Handle *self, PyObject *args, PyObject *kwargs) {
         CallState_begin(self, &cs);
 
         err = rd_kafka_metadata(self->rk, !only_rkt, only_rkt, &metadata,
-                                timeout >= 0 ? (int)(timeout * 1000.0f) : -1);
+                                cfl_timeout_ms(tmout));
 
         if (!CallState_end(self, &cs)) {
                 /* Exception raised */
diff --git a/confluent_kafka/src/Producer.c b/confluent_kafka/src/Producer.c
@@ -363,7 +363,7 @@ static PyObject *Producer_poll (Handle *self, PyObject *args,
         if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|d", kws, &tmout))
                 return NULL;
 
-	r = Producer_poll0(self, (int)(tmout * 1000));
+	r = Producer_poll0(self, cfl_timeout_ms(tmout));
 	if (r == -1)
 		return NULL;
 
@@ -385,7 +385,7 @@ static PyObject *Producer_flush (Handle *self, PyObject *args,
 
 #if RD_KAFKA_VERSION >= 0x00090300
         CallState_begin(self, &cs);
-        rd_kafka_flush(self->rk, tmout < 0 ? -1 : (int)(tmout * 1000));
+        rd_kafka_flush(self->rk, cfl_timeout_ms(tmout));
         if (!CallState_end(self, &cs))
                 return NULL;
         qlen = rd_kafka_outq_len(self->rk);
