You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

33 lines
1.1 KiB

  1. commit a4ca26661f95a60974fb13a78b1a0c89f9c09ea9
  2. Author: Willy Tarreau <w@1wt.eu>
  3. Date: Thu Jul 25 07:53:56 2019 +0200
  4. BUILD: threads: add the definition of PROTO_LOCK
  5. This one was added by commit daacf3664 ("BUG/MEDIUM: protocols: add a
  6. global lock for the init/deinit stuff") but I forgot to add it to the
  7. include file, breaking DEBUG_THREAD.
  8. (cherry picked from commit d6e0c03384cab2c72fb6ab841420045108ea4e6f)
  9. Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
  10. diff --git a/include/common/hathreads.h b/include/common/hathreads.h
  11. index a7c8dc93..b05215bd 100644
  12. --- a/include/common/hathreads.h
  13. +++ b/include/common/hathreads.h
  14. @@ -562,6 +562,7 @@ enum lock_label {
  15. AUTH_LOCK,
  16. LOGSRV_LOCK,
  17. DICT_LOCK,
  18. + PROTO_LOCK,
  19. OTHER_LOCK,
  20. LOCK_LABELS
  21. };
  22. @@ -679,6 +680,7 @@ static inline const char *lock_label(enum lock_label label)
  23. case AUTH_LOCK: return "AUTH";
  24. case LOGSRV_LOCK: return "LOGSRV";
  25. case DICT_LOCK: return "DICT";
  26. + case PROTO_LOCK: return "PROTO";
  27. case OTHER_LOCK: return "OTHER";
  28. case LOCK_LABELS: break; /* keep compiler happy */
  29. };