fix bug when syncing page containing read pointer

[tinyos-2.x.git] / tos / chips / at45db / LogStorageP.nc

diff --git a/tos/chips/at45db/LogStorageP.nc b/tos/chips/at45db/LogStorageP.nc
index 4f384f275fb970e1346e58892a6926bb0e2a0793..0f25515822d81c4d82c98281d948f04b589b22e3 100644 (file)
--- a/tos/chips/at45db/LogStorageP.nc
+++ b/tos/chips/at45db/LogStorageP.nc
@@ -267,6 +267,9 @@ implementation
   void sync() {
     metadata.flags = F_SYNC | F_LASTVALID;
     metadata.lastRecordOffset = s[client].woffset;
+    /* rend is now no longer the end of the page */
+    if (s[client].rpage == s[client].wpage)
+      s[client].rend = s[client].woffset;
     wmetadataStart();
   }
 
@@ -633,7 +636,7 @@ implementation
        would end on the last byte of the last page, as this would mean that
        we would not sync the last page, breaking the log volume
        invariant */
-    if (s[client].wpos % vlen >= vlen - len)
+    if ((s[client].wpos - PAGE_SIZE) % vlen >= vlen - len)
       sync();
     else
       {