diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 12:20:34 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 12:20:34 +0000 |
| commit | f3bb08bb1d94c77704371f8546a739119f0a05b4 (patch) | |
| tree | 5dfb47fa424ecde655f8950098411a311e9296e6 /src/peers.c | |
| parent | Releasing progress-linux version 2.9.6-1~progress7.99u1. (diff) | |
| download | haproxy-f3bb08bb1d94c77704371f8546a739119f0a05b4.tar.xz haproxy-f3bb08bb1d94c77704371f8546a739119f0a05b4.zip | |
Merging upstream version 2.9.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/peers.c')
| -rw-r--r-- | src/peers.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/peers.c b/src/peers.c index 5eefd18..9ba3d9b 100644 --- a/src/peers.c +++ b/src/peers.c @@ -1652,9 +1652,9 @@ static inline int peer_send_teach_process_msgs(struct appctx *appctx, struct pee { int ret; - HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->lock); + HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->updt_lock); ret = peer_send_teachmsgs(appctx, p, peer_teach_process_stksess_lookup, st); - HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->lock); + HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->updt_lock); return ret; } @@ -2688,18 +2688,18 @@ static inline int peer_send_msgs(struct appctx *appctx, } if (!(peer->flags & PEER_F_TEACH_PROCESS)) { - HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->lock); + HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->updt_lock); if (!(peer->flags & PEER_F_LEARN_ASSIGN) && (st->last_pushed != st->table->localupdate)) { repl = peer_send_teach_process_msgs(appctx, peer, st); if (repl <= 0) { - HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->lock); + HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->updt_lock); peer->stop_local_table = peer->last_local_table; return repl; } } - HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->lock); + HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->updt_lock); } else if (!(peer->flags & PEER_F_TEACH_FINISHED)) { if (!(st->flags & SHTABLE_F_TEACH_STAGE1)) { @@ -2894,7 +2894,7 @@ static inline void init_accepted_peer(struct peer *peer, struct peers *peers) uint commitid, updateid; st->last_get = st->last_acked = 0; - HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->lock); + HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->updt_lock); /* if st->update appears to be in future it means * that the last acked value is very old and we * remain unconnected a too long time to use this @@ -2918,7 +2918,7 @@ static inline void init_accepted_peer(struct peer *peer, struct peers *peers) __ha_cpu_relax(); } - HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->lock); + HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->updt_lock); } /* reset teaching and learning flags to 0 */ @@ -2959,7 +2959,7 @@ static inline void init_connected_peer(struct peer *peer, struct peers *peers) uint updateid, commitid; st->last_get = st->last_acked = 0; - HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->lock); + HA_RWLOCK_WRLOCK(STK_TABLE_LOCK, &st->table->updt_lock); /* if st->update appears to be in future it means * that the last acked value is very old and we * remain unconnected a too long time to use this @@ -2983,7 +2983,7 @@ static inline void init_connected_peer(struct peer *peer, struct peers *peers) __ha_cpu_relax(); } - HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->lock); + HA_RWLOCK_WRUNLOCK(STK_TABLE_LOCK, &st->table->updt_lock); } /* Init confirm counter */ |