From 87fb04af1e705b615ac01feba958f841ea4a71a6 Mon Sep 17 00:00:00 2001 From: Joe Conway Date: Fri, 5 Jun 2020 16:49:25 -0400 Subject: [PATCH] Add unlikely() to CHECK_FOR_INTERRUPTS() Add the unlikely() branch hint macro to CHECK_FOR_INTERRUPTS(). Backpatch to REL_10_STABLE where we first started using unlikely(). Discussion: https://www.postgresql.org/message-id/flat/8692553c-7fe8-17d9-cbc1-7cddb758f4c6%40joeconway.com --- src/include/miscadmin.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index 14fa127ab11..18bc8a7b904 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -98,16 +98,16 @@ extern void ProcessInterrupts(void); #define CHECK_FOR_INTERRUPTS() \ do { \ - if (InterruptPending) \ + if (unlikely(InterruptPending)) \ ProcessInterrupts(); \ } while(0) #else /* WIN32 */ #define CHECK_FOR_INTERRUPTS() \ do { \ - if (UNBLOCKED_SIGNAL_QUEUE()) \ + if (unlikely(UNBLOCKED_SIGNAL_QUEUE())) \ pgwin32_dispatch_queued_signals(); \ - if (InterruptPending) \ + if (unlikely(InterruptPending)) \ ProcessInterrupts(); \ } while(0) #endif /* WIN32 */