Changeset 49006 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Oct 9, 2013 2:10:51 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89737

Message:

Main/GuestFileImpl.cpp: More locking.

File:

• trunk/src/VBox/Main/src-client/GuestFileImpl.cpp (modified) (12 diffs)

trunk/src/VBox/Main/src-client/GuestFileImpl.cpp

@@ -700 +700 @@
     LogFlowThisFuncEnter();
 
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     LogFlowThisFunc(("strFile=%s, strOpenMode=%s, strDisposition=%s, uCreationMode=%RU32, uOffset=%RU64\n",
@@ -738 +738 @@
     paParms[i++].setUInt64(mData.mOpenInfo.mInitialOffset);
 
-    alock.release(); /* Drop read lock before sending. */
+    alock.release(); /* Drop write lock before sending. */
 
     vrc = sendCommand(HOST_FILE_OPEN, i, paParms);
@@ -759 +759 @@
     LogFlowThisFunc(("uSize=%RU32, uTimeoutMS=%RU32, pvData=%p, cbData=%zu\n",
                      uSize, uTimeoutMS, pvData, cbData));
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     int vrc;
 
@@ -785 +788 @@
     paParms[i++].setUInt32(uSize /* Size (in bytes) to read */);
 
+    alock.release(); /* Drop write lock before sending. */
+
     uint32_t cbRead;
     vrc = sendCommand(HOST_FILE_READ, i, paParms);
@@ -809 +814 @@
     LogFlowThisFunc(("uOffset=%RU64, uSize=%RU32, uTimeoutMS=%RU32, pvData=%p, cbData=%zu\n",
                      uOffset, uSize, uTimeoutMS, pvData, cbData));
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     int vrc;
 
@@ -836 +844 @@
     paParms[i++].setUInt32(uSize /* Size (in bytes) to read */);
 
+    alock.release(); /* Drop write lock before sending. */
+
     uint32_t cbRead;
     vrc = sendCommand(HOST_FILE_READ_AT, i, paParms);
@@ -860 +870 @@
     LogFlowThisFunc(("iOffset=%RI64, uTimeoutMS=%RU32\n",
                      iOffset, uTimeoutMS));
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     int vrc;
 
@@ -887 +900 @@
     /** @todo uint64_t vs. int64_t! */
     paParms[i++].setUInt64((uint64_t)iOffset /* Offset (in bytes) to start reading */);
+
+    alock.release(); /* Drop write lock before sending. */
 
     vrc = sendCommand(HOST_FILE_SEEK, i, paParms);
@@ -1104 +1119 @@
     LogFlowThisFunc(("uTimeoutMS=%RU32, pvData=%p, cbData=%zu\n",
                      uTimeoutMS, pvData, cbData));
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     int vrc;
 
@@ -1131 +1149 @@
     paParms[i++].setPointer(pvData, cbData);
 
+    alock.release(); /* Drop write lock before sending. */
+
     uint32_t cbWritten;
     vrc = sendCommand(HOST_FILE_WRITE, i, paParms);
@@ -1158 +1178 @@
     LogFlowThisFunc(("uOffset=%RU64, uTimeoutMS=%RU32, pvData=%p, cbData=%zu\n",
                      uOffset, uTimeoutMS, pvData, cbData));
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     int vrc;
 
@@ -1186 +1209 @@
     paParms[i++].setPointer(pvData, cbData);
 
+    alock.release(); /* Drop write lock before sending. */
+
     uint32_t cbWritten;
     vrc = sendCommand(HOST_FILE_WRITE_AT, i, paParms);