pgsql: Fix query cancellation handling in psql
От | Michael Paquier |
---|---|
Тема | pgsql: Fix query cancellation handling in psql |
Дата | |
Msg-id | E1ih1vl-0001J9-LR@gemulon.postgresql.org обсуждение исходный текст |
Список | pgsql-committers |
Fix query cancellation handling in psql The refactoring done in a4fd3aa for query cancellation has messed up with the logic in psql by mixing CancelRequested and cancel_pressed, breaking for example \watch. The former would be switched to true if a cancellation request has been attempted and that it actually succeeded, and the latter tracks if a cancellation attempt has been done. This commit brings back the code of psql to a state consistent to what it was before a4fd3aa, without giving up on the refactoring pieces introduced. It should be actually possible to merge more both flags as their concepts are close enough, however note that psql's --single-step mode relies on cancel_pressed to be always set, so this requires more careful analysis left for later. While on it, fix the declarations of CancelRequested (in cancel.c) and cancel_pressed (in psql) to be volatile sig_atomic_t. Previously, both were declared as booleans, which should be fine on modern platforms, but the C standard recommends the use of sig_atomic_t for variables used in signal handlers. Note that since its introduction in a1792320, CancelRequested declaration was not volatile. Reported-by: Jeff Janes Author: Michael Paquier Discussion: https://postgr.es/m/CAMkU=1zpoUDGKqWKuMWkj7t-bOCaJDx0r=5te_-d0B2HVLABXg@mail.gmail.com Branch ------ master Details ------- https://git.postgresql.org/pg/commitdiff/5d43c3c54d77f39135fe463539f5f438f460ae7e Modified Files -------------- src/bin/psql/common.c | 28 +++++++++------------------- src/fe_utils/cancel.c | 15 +++++++++++++-- src/fe_utils/print.c | 3 +-- src/include/fe_utils/cancel.h | 4 +++- src/include/fe_utils/print.h | 4 +++- 5 files changed, 29 insertions(+), 25 deletions(-)
В списке pgsql-committers по дате отправления: