Allow setting max-streams for multi handle

jeroen · Dec 4, 2024 · 403fc62 · 403fc62
1 parent 21b7793
commit 403fc62
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/R/multi.R b/R/multi.R
@@ -135,18 +135,20 @@ multi_run <- function(timeout = Inf, poll = FALSE, pool = NULL){
 
 #' @param total_con max total concurrent connections.
 #' @param host_con max concurrent connections per host.
-#' @param multiplex enable HTTP/2 multiplexing if supported by host and client.
+#' @param max_streams max concurrent multiplex streams for HTTP/2.
+#' @param multiplex use HTTP/2 multiplexing if supported by host and client.
 #' @export
 #' @useDynLib curl R_multi_setopt
 #' @rdname multi
-multi_set <- function(total_con = 50, host_con = 6, multiplex = TRUE, pool = NULL){
+multi_set <- function(total_con = 50, host_con = 6, max_streams = 10, multiplex = TRUE, pool = NULL){
   if(is.null(pool))
     pool <- multi_default()
   stopifnot(inherits(pool, "curl_multi"))
   stopifnot(is.numeric(total_con))
   stopifnot(is.numeric(host_con))
+  stopifnot(is.numeric(max_streams))
   stopifnot(is.logical(multiplex))
-  .Call(R_multi_setopt, pool, total_con, host_con, multiplex)
+  .Call(R_multi_setopt, pool, total_con, host_con, max_streams, multiplex)
 }
 
 #' @export

diff --git a/man/multi.Rd b/man/multi.Rd
diff --git a/src/curl-common.h b/src/curl-common.h
@@ -23,6 +23,10 @@
 #define HAS_CURL_PARSER 1
 #endif
 
+#if AT_LEAST_CURL(7, 67)
+#define HAS_MAX_STREAMS 1
+#endif
+
 #if AT_LEAST_CURL(7, 72)
 #define HAS_CURLINFO_EFFECTIVE_METHOD 1
 #endif

diff --git a/src/init.c b/src/init.c
@@ -74,7 +74,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"R_multi_list",          (DL_FUNC) &R_multi_list,          1},
     {"R_multi_new",           (DL_FUNC) &R_multi_new,           0},
     {"R_multi_run",           (DL_FUNC) &R_multi_run,           3},
-    {"R_multi_setopt",        (DL_FUNC) &R_multi_setopt,        4},
+    {"R_multi_setopt",        (DL_FUNC) &R_multi_setopt,        5},
     {"R_new_file_writer",     (DL_FUNC) &R_new_file_writer,     1},
     {"R_new_handle",          (DL_FUNC) &R_new_handle,          0},
     {"R_nslookup",            (DL_FUNC) &R_nslookup,            2},

diff --git a/src/multi.c b/src/multi.c
@@ -250,12 +250,15 @@ SEXP R_multi_new(void){
   return ptr;
 }
 
-SEXP R_multi_setopt(SEXP pool_ptr, SEXP total_con, SEXP host_con, SEXP multiplex){
+SEXP R_multi_setopt(SEXP pool_ptr, SEXP total_con, SEXP host_con, SEXP max_streams, SEXP multiplex){
     CURLM *multi = get_multiref(pool_ptr)->m;
     massert(curl_multi_setopt(multi, CURLMOPT_MAX_TOTAL_CONNECTIONS, (long) Rf_asInteger(total_con)));
     massert(curl_multi_setopt(multi, CURLMOPT_MAX_HOST_CONNECTIONS, (long) Rf_asInteger(host_con)));
     massert(curl_multi_setopt(multi, CURLMOPT_PIPELINING,
                               Rf_asLogical(multiplex) ? CURLPIPE_MULTIPLEX : CURLPIPE_NOTHING));
+#ifdef HAS_MAX_STREAMS
+    massert(curl_multi_setopt(multi, CURLMOPT_MAX_CONCURRENT_STREAMS, (long) Rf_asInteger(max_streams)));
+#endif
   return pool_ptr;
 }