wutdevoptab: Use scoped_lock

devkitPro · Apr 8, 2023 · b076627 · b076627
1 parent d73dc40
commit b076627
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 13 deletions.
diff --git a/libraries/wutdevoptab/MutexWrapper.h b/libraries/wutdevoptab/MutexWrapper.h
@@ -17,7 +17,6 @@ class MutexWrapper {
 
     void unlock() {
        OSUnlockMutex(&mutex);
-       OSMemoryBarrier();
     }
 
 private:

diff --git a/libraries/wutdevoptab/devoptab_fsa_close.cpp b/libraries/wutdevoptab/devoptab_fsa_close.cpp
@@ -17,7 +17,7 @@ __wut_fsa_close(struct _reent *r,
 
    deviceData = (__wut_fsa_device_t *) r->deviceData;
 
-   std::lock_guard<MutexWrapper> lock(file->mutex);
+   std::scoped_lock lock(file->mutex);
 
    status = FSACloseFile(deviceData->clientHandle, file->fd);
    if (status < 0) {

diff --git a/libraries/wutdevoptab/devoptab_fsa_dirclose.cpp b/libraries/wutdevoptab/devoptab_fsa_dirclose.cpp
@@ -17,7 +17,7 @@ __wut_fsa_dirclose(struct _reent *r,
 
    deviceData = (__wut_fsa_device_t *) r->deviceData;
 
-   std::lock_guard<MutexWrapper> lock(dir->mutex);
+   std::scoped_lock lock(dir->mutex);
 
    status = FSACloseDir(deviceData->clientHandle, dir->fd);
    if (status < 0) {

diff --git a/libraries/wutdevoptab/devoptab_fsa_dirnext.cpp b/libraries/wutdevoptab/devoptab_fsa_dirnext.cpp
@@ -19,7 +19,7 @@ __wut_fsa_dirnext(struct _reent *r,
    deviceData = (__wut_fsa_device_t *) r->deviceData;
    dir = (__wut_fsa_dir_t *) (dirState->dirStruct);
 
-   std::lock_guard<MutexWrapper> lock(dir->mutex);
+   std::scoped_lock lock(dir->mutex);
    memset(&dir->entry_data, 0, sizeof(dir->entry_data));
 
    status = FSAReadDir(deviceData->clientHandle, dir->fd, &dir->entry_data);

diff --git a/libraries/wutdevoptab/devoptab_fsa_diropen.cpp b/libraries/wutdevoptab/devoptab_fsa_diropen.cpp
@@ -24,7 +24,7 @@ __wut_fsa_diropen(struct _reent *r,
    free(fixedPath);
 
    dir->mutex.init(dir->name);
-   std::lock_guard<MutexWrapper> lock(dir->mutex);
+   std::scoped_lock lock(dir->mutex);
 
    deviceData = (__wut_fsa_device_t *) r->deviceData;
    status = FSAOpenDir(deviceData->clientHandle, dir->name, &fd);

diff --git a/libraries/wutdevoptab/devoptab_fsa_dirreset.cpp b/libraries/wutdevoptab/devoptab_fsa_dirreset.cpp
@@ -16,7 +16,7 @@ __wut_fsa_dirreset(struct _reent *r,
    dir = (__wut_fsa_dir_t *) (dirState->dirStruct);
    deviceData = (__wut_fsa_device_t *) r->deviceData;
 
-   std::lock_guard<MutexWrapper> lock(dir->mutex);
+   std::scoped_lock lock(dir->mutex);
 
    status = FSARewindDir(deviceData->clientHandle, dir->fd);
    if (status < 0) {

diff --git a/libraries/wutdevoptab/devoptab_fsa_fstat.cpp b/libraries/wutdevoptab/devoptab_fsa_fstat.cpp
@@ -18,7 +18,7 @@ __wut_fsa_fstat(struct _reent *r,
    file = (__wut_fsa_file_t *) fd;
    deviceData = (__wut_fsa_device_t *) r->deviceData;
 
-   std::lock_guard<MutexWrapper> lock(file->mutex);
+   std::scoped_lock lock(file->mutex);
 
    status = FSAGetStatFile(deviceData->clientHandle, file->fd, &fsStat);
    if (status < 0) {

diff --git a/libraries/wutdevoptab/devoptab_fsa_fsync.cpp b/libraries/wutdevoptab/devoptab_fsa_fsync.cpp
@@ -17,7 +17,7 @@ __wut_fsa_fsync(struct _reent *r,
 
    deviceData = (__wut_fsa_device_t *) r->deviceData;
 
-   std::lock_guard<MutexWrapper> lock(file->mutex);
+   std::scoped_lock lock(file->mutex);
 
    status = FSAFlushFile(deviceData->clientHandle, file->fd);
    if (status < 0) {

diff --git a/libraries/wutdevoptab/devoptab_fsa_open.cpp b/libraries/wutdevoptab/devoptab_fsa_open.cpp
@@ -85,7 +85,7 @@ __wut_fsa_open(struct _reent *r,
 
    // Init mutex and lock
    file->mutex.init(file->fullPath);
-   std::lock_guard<MutexWrapper> lock(file->mutex);
+   std::scoped_lock lock(file->mutex);
 
    if (createFileIfNotFound || failIfFileNotFound || (flags & (O_EXCL | O_CREAT)) == (O_EXCL | O_CREAT)) {
       // Check if file exists

diff --git a/libraries/wutdevoptab/devoptab_fsa_read.cpp b/libraries/wutdevoptab/devoptab_fsa_read.cpp
@@ -23,7 +23,7 @@ ssize_t __wut_fsa_read(struct _reent *r, void *fd, char *ptr, size_t len) {
 
    deviceData = (__wut_fsa_device_t *) r->deviceData;
 
-   std::lock_guard<MutexWrapper> lock(file->mutex);
+   std::scoped_lock lock(file->mutex);
 
    size_t bytesRead = 0;
    while (bytesRead < len) {

diff --git a/libraries/wutdevoptab/devoptab_fsa_seek.cpp b/libraries/wutdevoptab/devoptab_fsa_seek.cpp
@@ -21,7 +21,7 @@ __wut_fsa_seek(struct _reent *r,
 
    deviceData = (__wut_fsa_device_t *) r->deviceData;
 
-   std::lock_guard<MutexWrapper> lock(file->mutex);
+   std::scoped_lock lock(file->mutex);
 
    // Find the offset to see from
    switch (whence) {

diff --git a/libraries/wutdevoptab/devoptab_fsa_truncate.cpp b/libraries/wutdevoptab/devoptab_fsa_truncate.cpp
@@ -19,7 +19,7 @@ __wut_fsa_ftruncate(struct _reent *r,
 
    deviceData = (__wut_fsa_device_t *) r->deviceData;
 
-   std::lock_guard<MutexWrapper> lock(file->mutex);
+   std::scoped_lock lock(file->mutex);
 
    // Set the new file size
    status = FSASetPosFile(deviceData->clientHandle, file->fd, len);

diff --git a/libraries/wutdevoptab/devoptab_fsa_write.cpp b/libraries/wutdevoptab/devoptab_fsa_write.cpp
@@ -23,7 +23,7 @@ ssize_t __wut_fsa_write(struct _reent *r, void *fd, const char *ptr, size_t len)
 
    deviceData = (__wut_fsa_device_t *) r->deviceData;
 
-   std::lock_guard<MutexWrapper> lock(file->mutex);
+   std::scoped_lock lock(file->mutex);
 
    // If O_APPEND is set, we always write to the end of the file.
    // When writing we file->offset to the file size to keep in sync.