[PR #2466] [MERGED] Remove uses of `AutoLock::ALREADY_LOCKED` #2552

New issue

Closed

opened 2026-03-04 02:06:08 +03:00 by kerem · 0 comments

kerem commented

2026-03-04 02:06:08 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/s3fs-fuse/s3fs-fuse/pull/2466
Author: @gaul
Created: 6/4/2024
Status: ✅ Merged
Merged: 6/23/2024
Merged by: @ggtakec

Base: master ← Head: autolock/already-locked

📝 Commits (1)

887fb0b Remove uses of AutoLock::ALREADY_LOCKED

📊 Changes

16 files changed (+347 additions, -335 deletions)

View changed files

📝 src/autolock.h (+3 -0)
📝 src/cache.cpp (+16 -24)
📝 src/cache.h (+13 -4)
📝 src/curl.cpp (+14 -8)
📝 src/curl.h (+3 -2)
📝 src/fdcache.cpp (+12 -11)
📝 src/fdcache.h (+6 -2)
📝 src/fdcache_auto.cpp (+2 -2)
📝 src/fdcache_auto.h (+1 -1)
📝 src/fdcache_entity.cpp (+55 -89)
📝 src/fdcache_entity.h (+75 -21)
📝 src/fdcache_fdinfo.cpp (+39 -39)
📝 src/fdcache_fdinfo.h (+7 -7)
📝 src/s3fs.cpp (+22 -21)
📝 src/s3fs_cred.cpp (+61 -86)
📝 src/s3fs_cred.h (+18 -18)

📄 Description

Instead annotate the methods with REQUIRES so that the caller knows if they should lock. For public interfaces, introduce HasLock wrappers. This simplifies control flow, allows migration to std::mutex, and eventually will enable use of static lock checking.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/s3fs-fuse/s3fs-fuse/pull/2466 **Author:** [@gaul](https://github.com/gaul) **Created:** 6/4/2024 **Status:** ✅ Merged **Merged:** 6/23/2024 **Merged by:** [@ggtakec](https://github.com/ggtakec) **Base:** `master` ← **Head:** `autolock/already-locked` --- ### 📝 Commits (1) - [`887fb0b`](https://github.com/s3fs-fuse/s3fs-fuse/commit/887fb0b031aca62d66cb2b09485acba1213701f6) Remove uses of AutoLock::ALREADY_LOCKED ### 📊 Changes **16 files changed** (+347 additions, -335 deletions) <details> <summary>View changed files</summary> 📝 `src/autolock.h` (+3 -0) 📝 `src/cache.cpp` (+16 -24) 📝 `src/cache.h` (+13 -4) 📝 `src/curl.cpp` (+14 -8) 📝 `src/curl.h` (+3 -2) 📝 `src/fdcache.cpp` (+12 -11) 📝 `src/fdcache.h` (+6 -2) 📝 `src/fdcache_auto.cpp` (+2 -2) 📝 `src/fdcache_auto.h` (+1 -1) 📝 `src/fdcache_entity.cpp` (+55 -89) 📝 `src/fdcache_entity.h` (+75 -21) 📝 `src/fdcache_fdinfo.cpp` (+39 -39) 📝 `src/fdcache_fdinfo.h` (+7 -7) 📝 `src/s3fs.cpp` (+22 -21) 📝 `src/s3fs_cred.cpp` (+61 -86) 📝 `src/s3fs_cred.h` (+18 -18) </details> ### 📄 Description Instead annotate the methods with `REQUIRES` so that the caller knows if they should lock. For public interfaces, introduce `HasLock` wrappers. This simplifies control flow, allows migration to `std::mutex`, and eventually will enable use of static lock checking. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>