change log for rtems (2011-12-09)
rtems-vc at rtems.org
rtems-vc at rtems.org
Fri Dec 9 07:32:45 UTC 2011
*ccj*:
2011-12-09 Chris Johns <chrisj at rtems.org>
PR 1968/filesystem
* libfs/src/rfs/rtems-rfs-file.c: Fix to the seek bug where a seek
to 0 after reading the end of the file did not point to the
correct block.
* libfs/src/rfs/rtems-rfs-rtems.h,
libfs/src/rfs/rtems-rfs-trace.c: Fix the trace flags. Used to fix
the bug.
M 1.3077 cpukit/ChangeLog
M 1.9 cpukit/libfs/src/rfs/rtems-rfs-file.c
M 1.7 cpukit/libfs/src/rfs/rtems-rfs-rtems.h
M 1.5 cpukit/libfs/src/rfs/rtems-rfs-trace.c
diff -u rtems/cpukit/ChangeLog:1.3076 rtems/cpukit/ChangeLog:1.3077
--- rtems/cpukit/ChangeLog:1.3076 Thu Dec 8 08:15:05 2011
+++ rtems/cpukit/ChangeLog Fri Dec 9 01:21:00 2011
@@ -1,3 +1,14 @@
+2011-12-09 Chris Johns <chrisj at rtems.org>
+
+ PR 1968/filesystem
+ * libfs/src/rfs/rtems-rfs-file.c: Fix to the seek bug where a seek
+ to 0 after reading the end of the file did not point to the
+ correct block.
+ * libfs/src/rfs/rtems-rfs-rtems.h,
+ libfs/src/rfs/rtems-rfs-trace.c: Fix the trace flags. Used to fix
+ the bug.
+
+
2011-12-08 Ralf Corsépius <ralf.corsepius at rtems.org>
* rtems/src/rtemsobjectgetname.c:
diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c:1.8 rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c:1.9
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c:1.8 Sun Nov 6 06:44:23 2011
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c Fri Dec 9 01:21:01 2011
@@ -424,8 +424,45 @@
*/
if (pos < rtems_rfs_file_shared_get_size (rtems_rfs_file_fs (handle),
handle->shared))
+ {
rtems_rfs_file_set_bpos (handle, pos);
-
+
+ /*
+ * If the file has a block check if it maps to the current position and it
+ * does not release it. That will force us to get the block at the new
+ * position when the I/O starts.
+ */
+ if (rtems_rfs_buffer_handle_has_block (&handle->buffer))
+ {
+ rtems_rfs_buffer_block block;
+ int rc;
+
+ rc = rtems_rfs_block_map_find (rtems_rfs_file_fs (handle),
+ rtems_rfs_file_map (handle),
+ rtems_rfs_file_bpos (handle),
+ &block);
+ if (rc > 0)
+ return rc;
+ if (rtems_rfs_buffer_bnum (&handle->buffer) != block)
+ {
+ rc = rtems_rfs_buffer_handle_release (rtems_rfs_file_fs (handle),
+ rtems_rfs_file_buffer (handle));
+ if (rc > 0)
+ return rc;
+ }
+ }
+ }
+ else
+ {
+ /*
+ * The seek is outside the current file so release any buffer. A write will
+ * extend the file.
+ */
+ int rc = rtems_rfs_file_io_release (handle);
+ if (rc > 0)
+ return rc;
+ }
+
*new_pos = pos;
return 0;
}
@@ -441,23 +478,25 @@
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_IO))
printf ("rtems-rfs: file-set-size: size=%" PRIu64 "\n", new_size);
+ size = rtems_rfs_file_size (handle);
+
/*
- * Short cut for the common truncate on open call.
+ * If the file is same size do nothing else grow or shrink it ?
+ *
+ * If the file does not change size do not update the times.
*/
- if (new_size == 0)
- {
- rc = rtems_rfs_block_map_free_all (rtems_rfs_file_fs (handle), map);
- if (rc > 0)
- return rc;
- }
- else
+ if (size != new_size)
{
- size = rtems_rfs_file_size (handle);
-
/*
- * If the file is same size do nothing else grow or shrink it ?
+ * Short cut for the common truncate on open call.
*/
- if (size != new_size)
+ if (new_size == 0)
+ {
+ rc = rtems_rfs_block_map_free_all (rtems_rfs_file_fs (handle), map);
+ if (rc > 0)
+ return rc;
+ }
+ else
{
if (size < new_size)
{
@@ -567,14 +606,14 @@
rtems_rfs_file_bpos (handle));
}
}
- }
-
- handle->shared->size.count = rtems_rfs_block_map_count (map);
- handle->shared->size.offset = rtems_rfs_block_map_size_offset (map);
- if (rtems_rfs_file_update_mtime (handle))
- handle->shared->mtime = time (NULL);
+ handle->shared->size.count = rtems_rfs_block_map_count (map);
+ handle->shared->size.offset = rtems_rfs_block_map_size_offset (map);
+ if (rtems_rfs_file_update_mtime (handle))
+ handle->shared->mtime = time (NULL);
+ }
+
return 0;
}
diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.h:1.6 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.h:1.7
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.h:1.6 Tue Mar 15 02:32:39 2011
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.h Fri Dec 9 01:21:01 2011
@@ -25,12 +25,12 @@
#include <errno.h>
/**
- * RTEMS RFS RTEMS Error Enable. Set to 1 to printing of errors. Default is off.
+ * RTEMS RFS RTEMS Error Enable. Set to 1 for printing of errors. Default is off.
*/
#define RTEMS_RFS_RTEMS_ERROR 0
/**
- * RTEMS RFS RTEMS Trace Enable. Set to 1 to printing of errors. Default is off.
+ * RTEMS RFS RTEMS Trace Enable. Set to 1 for printing of errors. Default is off.
*/
#define RTEMS_RFS_RTEMS_TRACE 0
@@ -72,13 +72,14 @@
#define RTEMS_RFS_RTEMS_DEBUG_READLINK (1 << 9)
#define RTEMS_RFS_RTEMS_DEBUG_FCHMOD (1 << 10)
#define RTEMS_RFS_RTEMS_DEBUG_STAT (1 << 11)
-#define RTEMS_RFS_RTEMS_DEBUG_DIR_RMNOD (1 << 12)
-#define RTEMS_RFS_RTEMS_DEBUG_FILE_OPEN (1 << 13)
-#define RTEMS_RFS_RTEMS_DEBUG_FILE_CLOSE (1 << 14)
-#define RTEMS_RFS_RTEMS_DEBUG_FILE_READ (1 << 15)
-#define RTEMS_RFS_RTEMS_DEBUG_FILE_WRITE (1 << 16)
-#define RTEMS_RFS_RTEMS_DEBUG_FILE_LSEEK (1 << 17)
-#define RTEMS_RFS_RTEMS_DEBUG_FILE_FTRUNC (1 << 18)
+#define RTEMS_RFS_RTEMS_DEBUG_RENAME (1 << 12)
+#define RTEMS_RFS_RTEMS_DEBUG_DIR_RMNOD (1 << 13)
+#define RTEMS_RFS_RTEMS_DEBUG_FILE_OPEN (1 << 14)
+#define RTEMS_RFS_RTEMS_DEBUG_FILE_CLOSE (1 << 15)
+#define RTEMS_RFS_RTEMS_DEBUG_FILE_READ (1 << 16)
+#define RTEMS_RFS_RTEMS_DEBUG_FILE_WRITE (1 << 17)
+#define RTEMS_RFS_RTEMS_DEBUG_FILE_LSEEK (1 << 18)
+#define RTEMS_RFS_RTEMS_DEBUG_FILE_FTRUNC (1 << 19)
/**
* Call to check if this part is bring traced. If RTEMS_RFS_RTEMS_TRACE is
diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-trace.c:1.4 rtems/cpukit/libfs/src/rfs/rtems-rfs-trace.c:1.5
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-trace.c:1.4 Sun Nov 6 06:44:24 2011
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-trace.c Fri Dec 9 01:21:02 2011
@@ -92,7 +92,8 @@
"symlink-read",
"file-open",
"file-close",
- "file-io"
+ "file-io",
+ "file-set"
};
rtems_rfs_trace_mask set_value = 0;
@@ -140,9 +141,9 @@
if (strcmp (argv[arg], table[t]) == 0)
{
if (set)
- set_value = 1 << t;
+ set_value = 1ULL << t;
else
- clear_value = 1 << t;
+ clear_value = 1ULL << t;
break;
}
}
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20111209/c0e848b4/attachment-0001.html>
More information about the vc
mailing list