stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-29 04:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename lock to _lock in JObject

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-06-15 17:27:55 +02:00
parent 8cd16c5d6e
commit 77c2d63295
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/main/java/com/usatiuk/dhfs/storage/files/objects/Directory.java
View File

@@ -27,20 +27,20 @@ public class Directory extends FsNode {
} }
public <R> R runReadLocked(DirectoryFunction<R> fn) { public <R> R runReadLocked(DirectoryFunction<R> fn) {
lock.readLock().lock(); _lock.readLock().lock();
try { try {
return fn.apply(_fsNodeData, _directoryData); return fn.apply(_fsNodeData, _directoryData);
} finally { } finally {
lock.readLock().unlock(); _lock.readLock().unlock();
} }
} }
public <R> R runWriteLocked(DirectoryFunction<R> fn) { public <R> R runWriteLocked(DirectoryFunction<R> fn) {
lock.writeLock().lock(); _lock.writeLock().lock();
try { try {
return fn.apply(_fsNodeData, _directoryData); return fn.apply(_fsNodeData, _directoryData);
} finally { } finally {
lock.writeLock().unlock(); _lock.writeLock().unlock();
} }
} }

8
server/src/main/java/com/usatiuk/dhfs/storage/files/objects/File.java
View File

@@ -29,20 +29,20 @@ public class File extends FsNode {
} }
public <R> R runReadLocked(FileFunction<R> fn) { public <R> R runReadLocked(FileFunction<R> fn) {
lock.readLock().lock(); _lock.readLock().lock();
try { try {
return fn.apply(_fsNodeData, _fileData); return fn.apply(_fsNodeData, _fileData);
} finally { } finally {
lock.readLock().unlock(); _lock.readLock().unlock();
} }
} }
public <R> R runWriteLocked(FileFunction<R> fn) { public <R> R runWriteLocked(FileFunction<R> fn) {
lock.writeLock().lock(); _lock.writeLock().lock();
try { try {
return fn.apply(_fsNodeData, _fileData); return fn.apply(_fsNodeData, _fileData);
} finally { } finally {
lock.writeLock().unlock(); _lock.writeLock().unlock();
} }
} }
} }

8
server/src/main/java/com/usatiuk/dhfs/storage/files/objects/FsNode.java
View File

@@ -46,20 +46,20 @@ public abstract class FsNode extends JObject {
} }
public <R> R runReadLocked(FsNodeFunction<R> fn) { public <R> R runReadLocked(FsNodeFunction<R> fn) {
lock.readLock().lock(); _lock.readLock().lock();
try { try {
return fn.apply(_fsNodeData); return fn.apply(_fsNodeData);
} finally { } finally {
lock.readLock().unlock(); _lock.readLock().unlock();
} }
} }
public <R> R runWriteLocked(Function<FsNodeData, R> fn) { public <R> R runWriteLocked(Function<FsNodeData, R> fn) {
lock.writeLock().lock(); _lock.writeLock().lock();
try { try {
return fn.apply(_fsNodeData); return fn.apply(_fsNodeData);
} finally { } finally {
lock.writeLock().unlock(); _lock.writeLock().unlock();
} }
} }

6
server/src/main/java/com/usatiuk/dhfs/storage/objects/jrepository/JObject.java
View File

@@ -10,15 +10,15 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public abstract class JObject implements Serializable { public abstract class JObject implements Serializable {
public abstract String getName(); public abstract String getName();
protected final ReadWriteLock lock = new ReentrantReadWriteLock(); protected final ReadWriteLock _lock = new ReentrantReadWriteLock();
@Serial @Serial
private void writeObject(ObjectOutputStream oos) throws IOException { private void writeObject(ObjectOutputStream oos) throws IOException {
lock.readLock().lock(); _lock.readLock().lock();
try { try {
oos.defaultWriteObject(); oos.defaultWriteObject();
} finally { } finally {
lock.readLock().unlock(); _lock.readLock().unlock();
} }
} }
} }