From: Olivier Houchard <ohouchard@haproxy.com>
Date: Fri, 8 Mar 2019 17:53:21 +0000 (+0100)
Subject: MEDIUM: logs: Use the new _HA_ATOMIC_* macros.
X-Git-Tag: v2.0-dev2~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2ee3e72278b5a131308770a3f32da4fdfd67622;p=thirdparty%2Fhaproxy.git

MEDIUM: logs: Use the new _HA_ATOMIC_* macros.

Use the new _HA_ATOMIC_* macros and add barriers where needed.
---

diff --git a/src/log.c b/src/log.c
index 826f50e45e..9fb5c17626 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1559,7 +1559,7 @@ send:
 			static char once;
 
 			if (errno == EAGAIN)
-				HA_ATOMIC_ADD(&dropped_logs, 1);
+				_HA_ATOMIC_ADD(&dropped_logs, 1);
 			else if (!once) {
 				once = 1; /* note: no need for atomic ops here */
 				ha_alert("sendmsg()/writev() failed in logger #%d: %s (errno=%d)\n",
@@ -1698,7 +1698,7 @@ void deinit_log_buffers()
 	free(logheader_rfc5424);
 	free(logline);
 	free(logline_rfc5424);
-	tmp_startup_logs = HA_ATOMIC_XCHG(&startup_logs, NULL);
+	tmp_startup_logs = _HA_ATOMIC_XCHG(&startup_logs, NULL);
 	free(tmp_startup_logs);
 
 	logheader         = NULL;
@@ -1761,7 +1761,7 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 		txn = NULL;
 		be_conn = NULL;
 		s_flags = SF_ERR_PRXCOND | SF_FINST_R;
-		uniq_id = HA_ATOMIC_XADD(&global.req_count, 1);
+		uniq_id = _HA_ATOMIC_XADD(&global.req_count, 1);
 
 		/* prepare a valid log structure */
 		tmp_strm_log.tv_accept = sess->tv_accept;
@@ -2759,7 +2759,7 @@ void strm_log(struct stream *s)
 
 	size = build_logline(s, logline, global.max_syslog_len, &sess->fe->logformat);
 	if (size > 0) {
-		HA_ATOMIC_ADD(&sess->fe->log_count, 1);
+		_HA_ATOMIC_ADD(&sess->fe->log_count, 1);
 		__send_log(sess->fe, level, logline, size + 1, logline_rfc5424, sd_size);
 		s->logs.logwait = 0;
 	}
@@ -2797,7 +2797,7 @@ void sess_log(struct session *sess)
 
 	size = sess_build_logline(sess, NULL, logline, global.max_syslog_len, &sess->fe->logformat);
 	if (size > 0) {
-		HA_ATOMIC_ADD(&sess->fe->log_count, 1);
+		_HA_ATOMIC_ADD(&sess->fe->log_count, 1);
 		__send_log(sess->fe, level, logline, size + 1, logline_rfc5424, sd_size);
 	}
 }