avoid per-connection memory increase when PTLS_HAVE_LOG is off

h2o · Dec 2, 2024 · 5aa9358 · 5aa9358
1 parent f126480
commit 5aa9358
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/include/picotls.h b/include/picotls.h
@@ -68,8 +68,15 @@ extern "C" {
 #define PTLS_THREADLOCAL __declspec(thread)
 #else
 #define PTLS_THREADLOCAL __thread
+#endif
+
+#ifndef PTLS_HAVE_LOG
+#ifdef _WINDOWS
+#define PTLS_HAVE_LOG 0
+#else
 #define PTLS_HAVE_LOG 1
 #endif
+#endif
 
 #ifndef PTLS_FUZZ_HANDSHAKE
 #define PTLS_FUZZ_HANDSHAKE 0

diff --git a/lib/picotls.c b/lib/picotls.c
@@ -273,10 +273,12 @@ struct st_ptls_t {
     unsigned send_change_cipher_spec : 1;
     unsigned needs_key_update : 1;
     unsigned key_update_send_request : 1;
+#if PTLS_HAVE_LOG
     /**
      * see ptls_log
      */
     ptls_log_conn_state_t log_state;
+#endif
     struct {
         uint32_t active_conns;
         uint32_t generation;
@@ -5140,11 +5142,15 @@ static ptls_t *new_instance(ptls_context_t *ctx, int is_server)
     *tls = (ptls_t){ctx};
     tls->is_server = is_server;
     tls->send_change_cipher_spec = ctx->send_change_cipher_spec;
+
+#if PTLS_HAVE_LOG
     if (ptls_log_conn_state_override != NULL) {
         tls->log_state = *ptls_log_conn_state_override;
     } else {
         ptls_log_init_conn_state(&tls->log_state, ctx->random_bytes);
     }
+#endif
+
     return tls;
 }
 
@@ -5592,7 +5598,11 @@ void **ptls_get_data_ptr(ptls_t *tls)
 
 ptls_log_conn_state_t *ptls_get_log_state(ptls_t *tls)
 {
+#if PTLS_HAVE_LOG
     return &tls->log_state;
+#else
+    return &ptls_log.dummy_conn_state;
+#endif
 }
 
 static int handle_client_handshake_message(ptls_t *tls, ptls_message_emitter_t *emitter, ptls_iovec_t message, int is_end_of_record,