RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

libdl/obj-comp: Add trace prints when decompressing

Browse Source 
Updates #3969
This commit is contained in:
Chris Johns
2020-05-05 14:57:34 +10:00
parent d5fc2a6ad6
commit 3635d6a836
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpukit/include/rtems/rtl/rtl-trace.h
View File

@@ -54,7 +54,9 @@ typedef uint32_t rtems_rtl_trace_mask;
#define RTEMS_RTL_TRACE_ARCHIVE_SYMS (1UL << 13) #define RTEMS_RTL_TRACE_ARCHIVE_SYMS (1UL << 13)
#define RTEMS_RTL_TRACE_DEPENDENCY (1UL << 14) #define RTEMS_RTL_TRACE_DEPENDENCY (1UL << 14)
#define RTEMS_RTL_TRACE_BIT_ALLOC (1UL << 15) #define RTEMS_RTL_TRACE_BIT_ALLOC (1UL << 15)
#define RTEMS_RTL_TRACE_COMP (1UL << 16)
#define RTEMS_RTL_TRACE_ALL (0xffffffffUL & ~(RTEMS_RTL_TRACE_CACHE | \ #define RTEMS_RTL_TRACE_ALL (0xffffffffUL & ~(RTEMS_RTL_TRACE_CACHE | \
RTEMS_RTL_TRACE_COMP | \
RTEMS_RTL_TRACE_GLOBAL_SYM | \ RTEMS_RTL_TRACE_GLOBAL_SYM | \
RTEMS_RTL_TRACE_ARCHIVE_SYMS)) RTEMS_RTL_TRACE_ARCHIVE_SYMS))

31
cpukit/libdl/rtl-obj-comp.c
View File

@@ -21,10 +21,13 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <inttypes.h>
#include <rtems/inttypes.h>
#include <rtems/rtl/rtl-allocator.h> #include <rtems/rtl/rtl-allocator.h>
#include <rtems/rtl/rtl-obj-comp.h> #include <rtems/rtl/rtl-obj-comp.h>
#include "rtl-error.h" #include "rtl-error.h"
#include <rtems/rtl/rtl-trace.h>
#include "fastlz.h" #include "fastlz.h"
@@ -91,6 +94,13 @@ rtems_rtl_obj_comp_read (rtems_rtl_obj_comp* comp,
return false; return false;
} }
if (rtems_rtl_trace (RTEMS_RTL_TRACE_COMP))
printf ("rtl: comp: %2d: fd=%d length=%zu level=%u offset=%" PRIdoff_t " area=[%"
PRIdoff_t ",%" PRIdoff_t "] read=%" PRIu32 " size=%zu\n",
comp->fd, comp->cache->fd, length, comp->level, comp->offset,
comp->offset, comp->offset + length,
comp->read, comp->size);
if (comp->fd != comp->cache->fd) if (comp->fd != comp->cache->fd)
{ {
comp->level = 0; comp->level = 0;
@@ -104,10 +114,18 @@ rtems_rtl_obj_comp_read (rtems_rtl_obj_comp* comp,
if (buffer_level) if (buffer_level)
{ {
if (rtems_rtl_trace (RTEMS_RTL_TRACE_COMP))
printf ("rtl: comp: copy: length=%zu\n",
buffer_level);
memcpy (bin, comp->buffer, buffer_level); memcpy (bin, comp->buffer, buffer_level);
if ((comp->level - buffer_level) != 0) if ((comp->level - buffer_level) != 0)
{ {
if (rtems_rtl_trace (RTEMS_RTL_TRACE_COMP))
printf ("rtl: comp: copy-down: level=%u length=%zu\n",
comp->level, comp->level - buffer_level);
memmove (comp->buffer, memmove (comp->buffer,
comp->buffer + buffer_level, comp->buffer + buffer_level,
comp->level - buffer_level); comp->level - buffer_level);
@@ -126,6 +144,10 @@ rtems_rtl_obj_comp_read (rtems_rtl_obj_comp* comp,
size_t in_length = sizeof (block_size); size_t in_length = sizeof (block_size);
int decompressed; int decompressed;
if (rtems_rtl_trace (RTEMS_RTL_TRACE_COMP))
printf ("rtl: comp: read block-size: offset=%" PRIdoff_t "\n",
comp->offset);
if (!rtems_rtl_obj_cache_read (comp->cache, comp->fd, comp->offset, if (!rtems_rtl_obj_cache_read (comp->cache, comp->fd, comp->offset,
(void**) &input, &in_length)) (void**) &input, &in_length))
return false; return false;
@@ -136,6 +158,10 @@ rtems_rtl_obj_comp_read (rtems_rtl_obj_comp* comp,
in_length = block_size; in_length = block_size;
if (rtems_rtl_trace (RTEMS_RTL_TRACE_COMP))
printf ("rtl: comp: read block: offset=%" PRIdoff_t " size=%u\n",
comp->offset, block_size);
if (!rtems_rtl_obj_cache_read (comp->cache, comp->fd, comp->offset, if (!rtems_rtl_obj_cache_read (comp->cache, comp->fd, comp->offset,
(void**) &input, &in_length)) (void**) &input, &in_length))
return false; return false;
@@ -172,6 +198,11 @@ rtems_rtl_obj_comp_read (rtems_rtl_obj_comp* comp,
comp->offset += block_size; comp->offset += block_size;
comp->level = decompressed; comp->level = decompressed;
if (rtems_rtl_trace (RTEMS_RTL_TRACE_COMP))
printf ("rtl: comp: expand: offset=%" PRIdoff_t \
" level=%u read=%" PRIu32 "\n",
comp->offset, comp->level, comp->read);
} }
} }