Browse Source

fileio: fileio_size() can now fail

Part of making the fileio API more robust.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
tags/v0.5.0-rc1
Øyvind Harboe 11 years ago
parent
commit
3931b99d14
9 changed files with 92 additions and 20 deletions
  1. +10
    -4
      src/flash/mflash.c
  2. +7
    -1
      src/flash/nand/fileio.c
  3. +7
    -2
      src/flash/nand/tcl.c
  4. +18
    -4
      src/flash/nor/tcl.c
  5. +12
    -2
      src/helper/fileio.c
  6. +1
    -1
      src/helper/fileio.h
  7. +9
    -1
      src/target/etm.c
  8. +22
    -3
      src/target/image.c
  9. +6
    -2
      src/target/target.c

+ 10
- 4
src/flash/mflash.c View File

@@ -720,14 +720,20 @@ COMMAND_HANDLER(mg_write_cmd)
if (ret != ERROR_OK)
return ret;

int filesize;
buffer = malloc(MG_FILEIO_CHUNK);
if (!buffer) {
fileio_close(&fileio);
return ERROR_FAIL;
}
int retval = fileio_size(&fileio, &filesize);
if (retval != ERROR_OK) {
fileio_close(&fileio);
return retval;
}

cnt = fileio_size(&fileio) / MG_FILEIO_CHUNK;
res = fileio_size(&fileio) % MG_FILEIO_CHUNK;
cnt = filesize / MG_FILEIO_CHUNK;
res = filesize % MG_FILEIO_CHUNK;

struct duration bench;
duration_start(&bench);
@@ -752,8 +758,8 @@ COMMAND_HANDLER(mg_write_cmd)
if (duration_measure(&bench) == ERROR_OK)
{
command_print(CMD_CTX, "wrote %ld bytes from file %s "
"in %fs (%0.3f kB/s)", (long)fileio_size(&fileio), CMD_ARGV[1],
duration_elapsed(&bench), duration_kbps(&bench, fileio_size(&fileio)));
"in %fs (%0.3f kB/s)", (long)filesize, CMD_ARGV[1],
duration_elapsed(&bench), duration_kbps(&bench, filesize));
}

free(buffer);


+ 7
- 1
src/flash/nand/fileio.c View File

@@ -180,7 +180,13 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
return retval;

if (!need_size)
state->size = fileio_size(&state->fileio);
{
int filesize;
retval = fileio_size(&state->fileio, &filesize);
if (retval != ERROR_OK)
return retval;
state->size = filesize;
}

*dev = nand;



+ 7
- 2
src/flash/nand/tcl.c View File

@@ -388,9 +388,14 @@ COMMAND_HANDLER(handle_nand_dump_command)

if (nand_fileio_finish(&s) == ERROR_OK)
{
int filesize;
retval = fileio_size(&s.fileio, &filesize);
if (retval != ERROR_OK)
return retval;

command_print(CMD_CTX, "dumped %ld bytes in %fs (%0.3f KiB/s)",
(long)fileio_size(&s.fileio), duration_elapsed(&s.bench),
duration_kbps(&s.bench, fileio_size(&s.fileio)));
(long)filesize, duration_elapsed(&s.bench),
duration_kbps(&s.bench, filesize));
}
return ERROR_OK;
}


+ 18
- 4
src/flash/nor/tcl.c View File

@@ -604,9 +604,23 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
return ERROR_OK;
}

buffer = malloc(fileio_size(&fileio));
int filesize;
retval = fileio_size(&fileio, &filesize);
if (retval != ERROR_OK)
{
fileio_close(&fileio);
return retval;
}

buffer = malloc(filesize);
if (buffer == NULL)
{
fileio_close(&fileio);
LOG_ERROR("Out of memory");
return ERROR_FAIL;
}
size_t buf_cnt;
if (fileio_read(&fileio, fileio_size(&fileio), buffer, &buf_cnt) != ERROR_OK)
if (fileio_read(&fileio, filesize, buffer, &buf_cnt) != ERROR_OK)
{
free(buffer);
fileio_close(&fileio);
@@ -622,8 +636,8 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
{
command_print(CMD_CTX, "wrote %ld bytes from file %s to flash bank %u"
" at offset 0x%8.8" PRIx32 " in %fs (%0.3f KiB/s)",
(long)fileio_size(&fileio), CMD_ARGV[1], p->bank_number, offset,
duration_elapsed(&bench), duration_kbps(&bench, fileio_size(&fileio)));
(long)filesize, CMD_ARGV[1], p->bank_number, offset,
duration_elapsed(&bench), duration_kbps(&bench, filesize));
}

fileio_close(&fileio);


+ 12
- 2
src/helper/fileio.c View File

@@ -245,8 +245,18 @@ int fileio_write_u32(struct fileio *fileio_p, uint32_t data)
return retval;
}

int fileio_size(struct fileio *fileio_p)
/**
* FIX!!!!
*
* For now this can not fail, but that's because a seek was executed
* on startup.
*
* Avoiding the seek on startup opens up for using streams.
*
*/
int fileio_size(struct fileio *fileio_p, int *size)
{
struct fileio_internal *fileio = fileio_p->fp;
return fileio->size;
*size = fileio->size;
return ERROR_OK;
}

+ 1
- 1
src/helper/fileio.h View File

@@ -66,7 +66,7 @@ int fileio_write(struct fileio *fileio,

int fileio_read_u32(struct fileio *fileio, uint32_t *data);
int fileio_write_u32(struct fileio *fileio, uint32_t data);
int fileio_size(struct fileio *fileio);
int fileio_size(struct fileio *fileio, int *size);

#define ERROR_FILEIO_LOCATION_UNKNOWN (-1200)
#define ERROR_FILEIO_NOT_FOUND (-1201)


+ 9
- 1
src/target/etm.c View File

@@ -1897,7 +1897,15 @@ COMMAND_HANDLER(handle_etm_load_command)
return ERROR_FAIL;
}

if (fileio_size(&file) % 4)
int filesize;
int retval = fileio_size(&file, &filesize);
if (retval != ERROR_OK)
{
fileio_close(&file);
return retval;
}

if (filesize % 4)
{
command_print(CMD_CTX, "size isn't a multiple of 4, no valid trace data");
fileio_close(&file);


+ 22
- 3
src/target/image.c View File

@@ -158,7 +158,13 @@ static int image_ihex_buffer_complete_inner(struct image *image, char *lpszLine,
/* we can't determine the number of sections that we'll have to create ahead of time,
* so we locally hold them until parsing is finished */

ihex->buffer = malloc(fileio_size(fileio) >> 1);
int filesize;
int retval;
retval = fileio_size(fileio, &filesize);
if (retval != ERROR_OK)
return retval;

ihex->buffer = malloc(filesize >> 1);
cooked_bytes = 0x0;
image->num_sections = 0;
section[image->num_sections].private = &ihex->buffer[cooked_bytes];
@@ -537,7 +543,13 @@ static int image_mot_buffer_complete_inner(struct image *image, char *lpszLine,
/* we can't determine the number of sections that we'll have to create ahead of time,
* so we locally hold them until parsing is finished */

mot->buffer = malloc(fileio_size(fileio) >> 1);
int retval;
int filesize;
retval = fileio_size(fileio, &filesize);
if (retval != ERROR_OK)
return retval;

mot->buffer = malloc(filesize >> 1);
cooked_bytes = 0x0;
image->num_sections = 0;
section[image->num_sections].private = &mot->buffer[cooked_bytes];
@@ -743,11 +755,18 @@ int image_open(struct image *image, const char *url, const char *type_string)
{
return retval;
}
int filesize;
retval = fileio_size(&image_binary->fileio, &filesize);
if (retval != ERROR_OK)
{
fileio_close(&image_binary->fileio);
return retval;
}

image->num_sections = 1;
image->sections = malloc(sizeof(struct imagesection));
image->sections[0].base_address = 0x0;
image->sections[0].size = fileio_size(&image_binary->fileio);
image->sections[0].size = filesize;
image->sections[0].flags = 0;
}
else if (image->type == IMAGE_IHEX)


+ 6
- 2
src/target/target.c View File

@@ -2648,9 +2648,13 @@ COMMAND_HANDLER(handle_dump_image_command)

if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
{
int filesize;
retval = fileio_size(&fileio, &filesize);
if (retval != ERROR_OK)
return retval;
command_print(CMD_CTX,
"dumped %ld bytes in %fs (%0.3f KiB/s)", (long)fileio_size(&fileio),
duration_elapsed(&bench), duration_kbps(&bench, fileio_size(&fileio)));
"dumped %ld bytes in %fs (%0.3f KiB/s)", (long)filesize,
duration_elapsed(&bench), duration_kbps(&bench, filesize));
}

return retval;


Loading…
Cancel
Save