-#include "imio.h"
+#include "imager.h"
+#include "imageri.h"
#include <stdlib.h>
#ifndef _MSC_VER
#include <unistd.h>
typedef struct {
void* ptr;
size_t size;
- char comm[MAXDESC];
+ const char *file;
+ int line;
} malloc_entry;
malloc_entry malloc_pointers[MAXMAL];
buf += UNDRRNVAL;
malloc_pointers[i].ptr = buf;
malloc_pointers[i].size = size;
- sprintf(malloc_pointers[i].comm,"%s (%d)", file, line);
+ malloc_pointers[i].file = file;
+ malloc_pointers[i].line = line;
return buf;
}
-
-
-
void
malloc_state(void) {
- int i, total = 0;
+ int i;
+ size_t total = 0;
i_clear_error();
mm_log((0,"malloc_state()\n"));
bndcheck_all();
for(i=0; i<MAXMAL; i++) if (malloc_pointers[i].ptr != NULL) {
- mm_log((0,"%d: %d (0x%x) : %s\n", i, malloc_pointers[i].size, malloc_pointers[i].ptr, malloc_pointers[i].comm));
+ mm_log((0,"%d: %lu (%p) : %s (%d)\n", i, (unsigned long)malloc_pointers[i].size, malloc_pointers[i].ptr, malloc_pointers[i].file, malloc_pointers[i].line));
total += malloc_pointers[i].size;
}
if (total == 0) mm_log((0,"No memory currently used!\n"))
- else mm_log((0,"total: %d\n",total));
+ else mm_log((0,"total: %lu\n", (unsigned long)total));
}
}
if ( (buf = malloc(size+UNDRRNVAL+OVERRNVAL)) == NULL ) {
- mm_log((1,"Unable to allocate %i for %s (%i)\n", size, file, line));
+ mm_log((1,"Unable to allocate %ld for %s (%i)\n", (long)size, file, line));
exit(3);
}
buf = set_entry(i, buf, size, file, line);
- mm_log((1,"mymalloc_file_line: slot <%d> %d bytes allocated at %p for %s (%d)\n", i, size, buf, file, line));
+ mm_log((1,"mymalloc_file_line: slot <%d> %ld bytes allocated at %p for %s (%d)\n", i, (long)size, buf, file, line));
return buf;
}
+void *
+(mymalloc)(size_t size) {
+ return mymalloc_file_line(size, "unknown", 0);
+}
+
void*
myrealloc_file_line(void *ptr, size_t newsize, char* file, int line) {
char *buf;
}
if ( (buf = realloc(((char *)ptr)-UNDRRNVAL, UNDRRNVAL+OVERRNVAL+newsize)) == NULL ) {
- mm_log((1,"Unable to reallocate %i bytes at %p for %s (%i)\n", newsize, ptr, file, line));
+ mm_log((1,"Unable to reallocate %ld bytes at %p for %s (%i)\n", (long)
+ newsize, ptr, file, line));
exit(3);
}
buf = set_entry(i, buf, newsize, file, line);
- mm_log((1,"realloc_file_line: slot <%d> %d bytes allocated at %p for %s (%d)\n", i, newsize, buf, file, line));
+ mm_log((1,"realloc_file_line: slot <%d> %ld bytes allocated at %p for %s (%d)\n", i, (long)newsize, buf, file, line));
return buf;
}
+void *
+(myrealloc)(void *ptr, size_t newsize) {
+ return myrealloc_file_line(ptr, newsize, "unknown", 0);
+}
+
static
void
bndcheck(int idx) {
return;
}
- for(i=0;i<UNDRRNVAL;i++)
- if (pp[-(1+i)] != PADBYTE)
- mm_log((1,"bndcheck: UNDERRUN OF %d bytes detected: slot = %d, point = %p, size = %d\n", i+1, idx, pp, s ));
+ for(i=0;i<UNDRRNVAL;i++) {
+ if (pp[-(1+i)] != PADBYTE)
+ mm_log((1,"bndcheck: UNDERRUN OF %d bytes detected: slot = %d, point = %p, size = %ld\n", i+1, idx, pp, (long)s ));
+ }
- for(i=0;i<OVERRNVAL;i++)
+ for(i=0;i<OVERRNVAL;i++) {
if (pp[s+i] != PADBYTE)
- mm_log((1,"bndcheck: OVERRUN OF %d bytes detected: slot = %d, point = %p, size = %d\n", i+1, idx, pp, s ));
+ mm_log((1,"bndcheck: OVERRUN OF %d bytes detected: slot = %d, point = %p, size = %ld\n", i+1, idx, pp, (long)s ));
+ }
}
void
bndcheck(idx);
}
-
-
-
-
void
myfree_file_line(void *p, char *file, int line) {
char *pp = p;
int match = 0;
int i;
+
+ if (p == NULL)
+ return;
for(i=0; i<MAXMAL; i++) if (malloc_pointers[i].ptr == p) {
- mm_log((1,"myfree_file_line: pointer %i (%s) freed at %s (%i)\n", i, malloc_pointers[i].comm, file, line));
+ mm_log((1,"myfree_file_line: pointer %i (%s (%d)) freed at %s (%i)\n", i, malloc_pointers[i].file, malloc_pointers[i].line, file, line));
bndcheck(i);
malloc_pointers[i].ptr = NULL;
match++;
free(pp-UNDRRNVAL);
}
-#else
+void
+(myfree)(void *block) {
+ myfree_file_line(block, "unknown", 0);
+}
-#define malloc_comm(a,b) (mymalloc(a))
+#else
void
malloc_state() {
- printf("malloc_state: not in debug mode\n");
}
void*
-mymalloc(int size) {
+mymalloc(size_t size) {
void *buf;
- if (size < 0) {
- fprintf(stderr, "Attempt to allocate size %d\n", size);
- exit(3);
- }
-
if ( (buf = malloc(size)) == NULL ) {
- mm_log((1, "mymalloc: unable to malloc %d\n", size));
- fprintf(stderr,"Unable to malloc %d.\n", size); exit(3);
+ mm_log((1, "mymalloc: unable to malloc %ld\n", (long)size));
+ fprintf(stderr,"Unable to malloc %ld.\n", (long)size); exit(3);
}
- mm_log((1, "mymalloc(size %d) -> %p\n", size, buf));
+ mm_log((1, "mymalloc(size %ld) -> %p\n", (long)size, buf));
return buf;
}
+void *
+mymalloc_file_line(size_t size, char *file, int line) {
+ return mymalloc(size);
+}
+
void
myfree(void *p) {
mm_log((1, "myfree(p %p)\n", p));
free(p);
}
+void
+myfree_file_line(void *p, char *file, int line) {
+ myfree(p);
+}
+
void *
myrealloc(void *block, size_t size) {
void *result;
- mm_log((1, "myrealloc(block %p, size %u)\n", block, size));
+ mm_log((1, "myrealloc(block %p, size %ld)\n", block, (long)size));
if ((result = realloc(block, size)) == NULL) {
mm_log((1, "myrealloc: out of memory\n"));
fprintf(stderr, "Out of memory.\n");
return result;
}
+void *
+myrealloc_file_line(void *block, size_t newsize, char *file, int size) {
+ return myrealloc(block, newsize);
+}
+
#endif /* IMAGER_MALLOC_DEBUG */
#undef min
#undef max
-int
-i_min(int a,int b) {
+i_img_dim
+i_minx(i_img_dim a, i_img_dim b) {
if (a<b) return a; else return b;
}
-int
-i_max(int a,int b) {
+i_img_dim
+i_maxx(i_img_dim a, i_img_dim b) {
if (a>b) return a; else return b;
}
};
/*
-=item utf8_advance(char **p, int *len)
+=item i_utf8_advance(char **p, size_t *len)
-Retreive a UTF8 character from the stream.
+Retrieve a C<UTF-8> character from the stream.
Modifies *p and *len to indicate the consumed characters.
-This doesn't support the extended UTF8 encoding used by later versions
-of Perl.
+This doesn't support the extended C<UTF-8> encoding used by later
+versions of Perl. Since this is typically used to implement text
+output by font drivers, the strings supplied shouldn't have such out
+of range characters.
+
+This doesn't check that the C<UTF-8> character is using the shortest
+possible representation.
+
+Returns ~0UL on failure.
=cut
*/
-unsigned long i_utf8_advance(char const **p, int *len) {
+unsigned long
+i_utf8_advance(char const **p, size_t *len) {
unsigned char c;
int i, ci, clen = 0;
unsigned char codes[3];
for (i = 0; i < sizeof(utf8_sizes)/sizeof(*utf8_sizes); ++i) {
if ((c & utf8_sizes[i].mask) == utf8_sizes[i].expect) {
clen = utf8_sizes[i].size;
+ break;
}
}
if (clen == 0 || *len < clen-1) {
projects / imager.git / blobdiff