annotate src/debug.c @ 108:1b2a4fac1303 stable-0-6-21

fix title bug with old schema in pst2ldif, also escape commas in distinguished names per rfc4514.
author Carl Byington <carl@five-ten-sg.com>
date Tue, 21 Oct 2008 14:37:13 -0700
parents 1fc33da23175
children 0f1492b7fe8b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
48
f66078abed38 more fixes for 64 bit format
carl
parents: 46
diff changeset
1
f66078abed38 more fixes for 64 bit format
carl
parents: 46
diff changeset
2 #include "define.h"
f66078abed38 more fixes for 64 bit format
carl
parents: 46
diff changeset
3
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
4 #include <stdio.h>
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
5 #include <stdlib.h>
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
6 #include <stdarg.h>
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
7 #include <ctype.h>
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
8 #include <string.h>
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
9 #include <limits.h>
91
9bd455802437 More fixes for 32/64 bit portability on big endian ppc.
Carl Byington <carl@five-ten-sg.com>
parents: 90
diff changeset
10 #include <stdint.h>
9bd455802437 More fixes for 32/64 bit portability on big endian ppc.
Carl Byington <carl@five-ten-sg.com>
parents: 90
diff changeset
11 #include <inttypes.h>
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
12
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
13 struct pst_debug_item {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
14 int type;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
15 char * function;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
16 unsigned int line;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
17 char * file;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
18 char * text;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
19 struct pst_debug_item *next;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
20 } *item_head=NULL, *item_tail=NULL, *item_ptr=NULL, *info_ptr=NULL, *temp_list=NULL;
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
21
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
22
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
23 struct pst_debug_func {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
24 char * name;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
25 struct pst_debug_func *next;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
26 } *func_head=NULL, *func_ptr=NULL;
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
27
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
28
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
29 void pst_debug_write_msg(struct pst_debug_item *item, const char *fmt, va_list *ap, int size);
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
30 void pst_debug_write_hex(struct pst_debug_item *item, char *buf, size_t size, int col);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
31 void * xmalloc(size_t size);
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
32
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
33 size_t pst_debug_fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream) {
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
34 return fwrite(ptr, size, nitems, stream);
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
35 }
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
36
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
37
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
38 // the largest text size we will store in memory. Otherwise we
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
39 // will do a debug_write, then create a new record, and write the
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
40 // text body directly to the file
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
41 #define MAX_MESSAGE_SIZE 4096
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
42
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
43 void pst_debug(const char *fmt, ...) {
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
44 va_list ap;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
45 va_start(ap,fmt);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
46 vfprintf(stderr, fmt, ap);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
47 va_end(ap);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
48 }
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
49
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
50
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
51 #define NUM_COL 30
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
52 void pst_debug_hexdumper(FILE *out, char *buf, size_t size, int col, int delta) {
70
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile.
Carl Byington <carl@five-ten-sg.com>
parents: 48
diff changeset
53 size_t off = 0, toff;
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
54 int count = 0;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
55
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
56 if (!out) return; // no file
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
57 if (col == -1) col = NUM_COL;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
58 fprintf(out, "\n");
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
59 while (off < size) {
90
631d02d30a1c More fixes for 32/64 bit portability on big endian ppc.
Carl Byington <carl@five-ten-sg.com>
parents: 79
diff changeset
60 fprintf(out, "%06"PRIx64"\t:", (uint64_t)(off+delta));
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
61 toff = off;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
62 while (count < col && off < size) {
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
63 fprintf(out, "%02hhx ", (unsigned char)buf[off]);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
64 off++; count++;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
65 }
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
66 off = toff;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
67 while (count < col) {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
68 // only happens at end of block to pad the text over to the text column
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
69 fprintf(out, " ");
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
70 count++;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
71 }
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
72 count = 0;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
73 fprintf(out, ":");
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
74 while (count < col && off < size) {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
75 fprintf(out, "%c", isgraph(buf[off])?buf[off]:'.');
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
76 off++; count ++;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
77 }
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
78
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
79 fprintf(out, "\n");
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
80 count=0;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
81 }
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
82
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
83 fprintf(out, "\n");
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
84 }
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
85
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
86
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
87 FILE *debug_fp = NULL;
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
88 unsigned int max_items=DEBUG_MAX_ITEMS, curr_items=0;
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
89
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
90
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
91 void pst_debug_init(const char* fname) {
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
92 unsigned char version = DEBUG_VERSION;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
93 item_head = item_tail = NULL;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
94 curr_items = 0;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
95 if (debug_fp) pst_debug_close();
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
96 if (!fname) return;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
97 if ((debug_fp = fopen(fname, "wb")) == NULL) {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
98 fprintf(stderr, "Opening of file %s failed\n", fname);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
99 exit(1);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
100 }
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
101 pst_debug_fwrite(&version, sizeof(char), 1, debug_fp);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
102 }
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
103
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
104
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
105 // function must be called before pst_debug_msg. It sets up the
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
106 // structure for the function that follows
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
107 void pst_debug_msg_info(int line, const char* file, int type) {
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
108 char *x;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
109 if (!debug_fp) return; // no file
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
110 info_ptr = (struct pst_debug_item*) xmalloc(sizeof(struct pst_debug_item));
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
111 info_ptr->type = type;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
112 info_ptr->line = line;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
113 x = (func_head==NULL?"No Function":func_head->name);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
114 info_ptr->function = (char*) xmalloc(strlen(x)+1);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
115 strcpy(info_ptr->function, x);
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
116
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
117 info_ptr->file = (char*) xmalloc(strlen(file)+1);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
118 strcpy(info_ptr->file, file);
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
119
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
120 //put the current record on a temp linked list
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
121 info_ptr->next = temp_list;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
122 temp_list = info_ptr;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
123 }
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
124
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
125
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
126 void pst_debug_msg_text(const char* fmt, ...) {
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
127 va_list ap;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
128 int f, g;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
129 char x[2];
79
56fa05fd5271 Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
130 #ifdef _WIN32
56fa05fd5271 Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
131 char *buf = NULL;
56fa05fd5271 Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
132 #endif
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
133 struct pst_debug_item *temp;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
134 if (!debug_fp) return; // no file
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
135 // get the record off of the temp_list
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
136 info_ptr = temp_list;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
137 if (info_ptr)
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
138 temp_list = info_ptr->next;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
139 else {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
140 fprintf(stderr, "NULL info_ptr. ERROR!!\n");
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
141 exit(-2);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
142 }
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
143
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
144 #ifdef _WIN32
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
145 // vsnprintf trick doesn't work on msvc.
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
146 g = 2000;
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
147 f = -1;
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
148 while (f < 0) {
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
149 buf = realloc(buf, g+1);
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
150 va_start(ap, fmt);
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
151 f = vsnprintf(buf, g, fmt, ap);
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
152 va_end(ap);
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
153 g += g/2;
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
154 }
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
155 free(buf);
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
156 #else
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
157 // according to glibc 2.1, this should return the req. number of bytes for
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
158 // the string
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
159 va_start(ap, fmt);
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
160 f = vsnprintf(x, 1, fmt, ap);
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
161 va_end(ap);
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
162 #endif
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
163
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
164 if (f > 0 && f < MAX_MESSAGE_SIZE) {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
165 info_ptr->text = (char*) xmalloc(f+1);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
166 va_start(ap, fmt);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
167 if ((g = vsnprintf(info_ptr->text, f, fmt, ap)) == -1) {
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
168 fprintf(stderr, "_debug_msg: Dying! vsnprintf returned -1 for format \"%s\"\n", fmt);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
169 exit(-2);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
170 }
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
171 va_end(ap);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
172 info_ptr->text[g] = '\0';
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
173 if (f != g) {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
174 fprintf(stderr, "_debug_msg: f != g\n");
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
175 }
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
176 } else if (f > 0) { // it is over the max_message_size then
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
177 f += strlen(info_ptr->file)+strlen(info_ptr->function);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
178 temp = info_ptr;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
179 pst_debug_write(); // dump the current messages
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
180 info_ptr = temp;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
181 va_start(ap, fmt);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
182 pst_debug_write_msg(info_ptr, fmt, &ap, f);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
183 va_end(ap);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
184 free(info_ptr->function);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
185 free(info_ptr->file);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
186 free(info_ptr);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
187 info_ptr = NULL;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
188 return;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
189 } else {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
190 fprintf(stderr, "_debug_msg: error getting requested size of debug message\n");
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
191 info_ptr->text = "ERROR Saving\n";
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
192 }
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
193
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
194 // add to the linked list of pending items
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
195 if (!item_head) item_head = info_ptr;
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
196 info_ptr->next = NULL;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
197 if (item_tail) item_tail->next = info_ptr;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
198 item_tail = info_ptr;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
199
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
200 if (++curr_items == max_items) {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
201 // here we will jump off and save the contents
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
202 pst_debug_write();
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
203 info_ptr = NULL;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
204 }
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
205 }
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
206
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
207
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
208 void pst_debug_hexdump(char *x, size_t y, int cols, int delta) {
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
209 struct pst_debug_item *temp;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
210 if (!debug_fp) return; // no file
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
211 info_ptr = temp_list;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
212 if (info_ptr) temp_list = info_ptr->next;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
213 temp = info_ptr;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
214 pst_debug_write();
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
215 info_ptr = temp;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
216 pst_debug_write_hex(info_ptr, x, y, cols);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
217 free(info_ptr->function);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
218 free(info_ptr->file);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
219 free(info_ptr);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
220 info_ptr = NULL;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
221 }
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
222
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
223
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
224 void pst_debug_func(const char *function) {
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
225 func_ptr = xmalloc (sizeof(struct pst_debug_func));
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
226 func_ptr->name = xmalloc(strlen(function)+1);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
227 strcpy(func_ptr->name, function);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
228 func_ptr->next = func_head;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
229 func_head = func_ptr;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
230 }
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
231
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
232
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
233 void pst_debug_func_ret() {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
234 //remove the head item
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
235 func_ptr = func_head;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
236 if (func_head) {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
237 func_head = func_head->next;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
238 free(func_ptr->name);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
239 free(func_ptr);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
240 } else {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
241 DIE(("function list is empty!\n"));
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
242 }
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
243 }
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
244
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
245
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
246 void pst_debug_close(void) {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
247 pst_debug_write();
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
248 while (func_head) {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
249 func_ptr = func_head;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
250 func_head = func_head->next;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
251 free(func_ptr->name);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
252 free(func_ptr);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
253 }
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
254 if (debug_fp) fclose(debug_fp);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
255 debug_fp = NULL;
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
256 }
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
257
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
258
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
259 void pst_debug_write() {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
260 size_t size, ptr, funcname, filename, text, end;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
261 char *buf = NULL, rec_type;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
262 if (!debug_fp) return; // no file
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
263 off_t index_pos = ftello(debug_fp);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 37
diff changeset
264 off_t file_pos = index_pos;
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
265 // add 2. One for the pointer to the next index,
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
266 // one for the count of this index
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
267 int index_size = ((curr_items+2) * sizeof(off_t));
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
268 off_t *index;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
269 int index_ptr = 0;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
270 struct pst_debug_file_rec_m mfile_rec;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
271 struct pst_debug_file_rec_l lfile_rec;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
272
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
273 if (curr_items == 0) return; // no items to write.
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
274
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
275 index = (off_t*)xmalloc(index_size);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
276 memset(index, 0, index_size); // valgrind, avoid writing uninitialized data
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
277 file_pos += index_size;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
278 // write the index first, we will re-write it later, but
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
279 // we want to allocate the space
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
280 pst_debug_fwrite(index, index_size, 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
281 index[index_ptr++] = curr_items;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
282
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
283 item_ptr = item_head;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
284 while (item_ptr) {
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
285 file_pos = ftello(debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
286 index[index_ptr++] = file_pos;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
287 size = strlen(item_ptr->function) +
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
288 strlen(item_ptr->file) +
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
289 strlen(item_ptr->text) + 3; //for the three \0s
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
290 if (buf) free(buf);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
291 buf = xmalloc(size+1);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
292 ptr = 0;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
293 funcname=ptr;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
294 ptr += sprintf(&(buf[ptr]), "%s", item_ptr->function)+1;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
295 filename=ptr;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
296 ptr += sprintf(&(buf[ptr]), "%s", item_ptr->file)+1;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
297 text=ptr;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
298 ptr += sprintf(&(buf[ptr]), "%s", item_ptr->text)+1;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
299 end=ptr;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
300 if (end > USHRT_MAX) { // bigger than can be stored in a short
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
301 rec_type = 'L';
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
302 pst_debug_fwrite(&rec_type, sizeof(char), 1, debug_fp);
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
303 lfile_rec.type = item_ptr->type;
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
304 lfile_rec.line = item_ptr->line;
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
305 lfile_rec.funcname = funcname;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
306 lfile_rec.filename = filename;
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
307 lfile_rec.text = text;
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
308 lfile_rec.end = end;
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
309 pst_debug_fwrite(&lfile_rec, sizeof(lfile_rec), 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
310 } else {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
311 rec_type = 'M';
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
312 pst_debug_fwrite(&rec_type, sizeof(char), 1, debug_fp);
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
313 mfile_rec.type = item_ptr->type;
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
314 mfile_rec.line = item_ptr->line;
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
315 mfile_rec.funcname = funcname;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
316 mfile_rec.filename = filename;
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
317 mfile_rec.text = text;
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
318 mfile_rec.end = end;
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
319 pst_debug_fwrite(&mfile_rec, sizeof(mfile_rec), 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
320 }
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
321 pst_debug_fwrite(buf, ptr, 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
322 if (buf) free(buf); buf = NULL;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
323 item_head = item_ptr->next;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
324 free(item_ptr->function);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
325 free(item_ptr->file);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
326 free(item_ptr->text);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
327 free(item_ptr);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
328 item_ptr = item_head;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
329 }
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
330 curr_items = 0;
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
331 index[index_ptr] = ftello(debug_fp);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
332
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
333 // we should now have a complete index
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
334 fseeko(debug_fp, index_pos, SEEK_SET);
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
335 pst_debug_fwrite(index, index_size, 1, debug_fp);
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
336 fseeko(debug_fp, 0, SEEK_END);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
337 item_ptr = item_head = item_tail = NULL;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
338 free(index);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
339 if (buf) free(buf);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
340 }
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
341
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
342
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
343 void pst_debug_write_msg(struct pst_debug_item *item, const char *fmt, va_list *ap, int size) {
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
344 struct pst_debug_file_rec_l lfile_rec;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
345 struct pst_debug_file_rec_m mfile_rec;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
346 unsigned char rec_type;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
347 int index_size = 3 * sizeof(off_t);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
348 off_t index[3];
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
349 off_t index_pos, file_pos;
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
350 char zero = '\0';
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
351 unsigned int end;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
352 if (!debug_fp) return; // no file
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
353 index[0] = 1; // only one item in this index
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
354 index[1] = 0; // valgrind, avoid writing uninitialized data
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
355 index[2] = 0; // ""
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
356 index_pos = ftello(debug_fp);
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
357 pst_debug_fwrite(index, index_size, 1, debug_fp);
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
358
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
359 index[1] = ftello(debug_fp);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
360
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
361 if (size > USHRT_MAX) { // bigger than can be stored in a short
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
362 rec_type = 'L';
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
363 pst_debug_fwrite(&rec_type, sizeof(char), 1, debug_fp);
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
364 lfile_rec.type = item->type;
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
365 lfile_rec.line = item->line;
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
366 lfile_rec.funcname = 0;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
367 lfile_rec.filename = strlen(item->function)+1;
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
368 lfile_rec.text = lfile_rec.filename+strlen(item->file)+1;
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
369 lfile_rec.end = 0; // valgrind, avoid writing uninitialized data
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
370 pst_debug_fwrite(&lfile_rec, sizeof(lfile_rec), 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
371 } else {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
372 rec_type = 'M';
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
373 pst_debug_fwrite(&rec_type, sizeof(char), 1, debug_fp);
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
374 mfile_rec.type = item->type;
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
375 mfile_rec.line = item->line;
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
376 mfile_rec.funcname = 0;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
377 mfile_rec.filename = strlen(item->function)+1;
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
378 mfile_rec.text = mfile_rec.filename+strlen(item->file)+1;
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
379 mfile_rec.end = 0; // valgrind, avoid writing uninitialized data
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
380 pst_debug_fwrite(&mfile_rec, sizeof(mfile_rec), 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
381 }
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
382 file_pos = ftello(debug_fp);
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
383 pst_debug_fwrite(item->function, strlen(item->function)+1, 1, debug_fp);
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
384 pst_debug_fwrite(item->file, strlen(item->file)+1, 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
385 vfprintf(debug_fp, fmt, *ap);
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
386 pst_debug_fwrite(&zero, 1, 1, debug_fp);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
387
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
388 end = (unsigned int) (ftello(debug_fp) - file_pos);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
389
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
390 index[2] = ftello(debug_fp);
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
391 fseeko(debug_fp, index_pos, SEEK_SET);
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
392 pst_debug_fwrite(index, index_size, 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
393 if (size > USHRT_MAX) {
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
394 pst_debug_fwrite(&rec_type, sizeof(char), 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
395 lfile_rec.end = end;
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
396 pst_debug_fwrite(&lfile_rec, sizeof(lfile_rec), 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
397 } else {
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
398 pst_debug_fwrite(&rec_type, sizeof(char), 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
399 mfile_rec.end = end;
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
400 pst_debug_fwrite(&mfile_rec, sizeof(mfile_rec), 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
401 }
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
402 fseeko(debug_fp, 0, SEEK_END);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
403 }
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
404
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
405
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
406 void pst_debug_write_hex(struct pst_debug_item *item, char *buf, size_t size, int col) {
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
407 struct pst_debug_file_rec_l lfile_rec;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
408 unsigned char rec_type;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
409 int index_size = 3 * sizeof(off_t);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
410 off_t index_pos, file_pos, index[3];
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
411 char zero='\0';
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
412 if (!debug_fp) return; // no file
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
413 index[0] = 1; // only one item in this index run
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
414 index[1] = 0; // valgrind, avoid writing uninitialized data
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
415 index[2] = 0; // ""
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
416 index_pos = ftello(debug_fp);
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
417 pst_debug_fwrite(index, index_size, 1, debug_fp);
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
418 index[1] = ftello(debug_fp);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
419
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
420 // always use the long
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
421 rec_type = 'L';
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
422 pst_debug_fwrite(&rec_type, sizeof(char), 1, debug_fp);
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
423 lfile_rec.funcname = 0;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
424 lfile_rec.filename = strlen(item->function)+1;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
425 lfile_rec.text = lfile_rec.filename+strlen(item->file)+1;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
426 lfile_rec.end = 0; // valgrind, avoid writing uninitialized data
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
427 lfile_rec.line = item->line;
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
428 lfile_rec.type = item->type;
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
429 pst_debug_fwrite(&lfile_rec, sizeof(lfile_rec), 1, debug_fp);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
430
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
431 file_pos = ftello(debug_fp);
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
432 pst_debug_fwrite(item->function, strlen(item->function)+1, 1, debug_fp);
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
433 pst_debug_fwrite(item->file, strlen(item->file)+1, 1, debug_fp);
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
434
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
435 pst_debug_hexdumper(debug_fp, buf, size, col, 0);
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
436 pst_debug_fwrite(&zero, 1, 1, debug_fp);
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
437 lfile_rec.end = ftello(debug_fp) - file_pos;
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
438
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
439 index[2] = ftello(debug_fp);
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
440 fseeko(debug_fp, index_pos, SEEK_SET);
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
441 pst_debug_fwrite(index, index_size, 1, debug_fp);
101
1fc33da23175 fix for orphan children when building descriptor tree, avoid writing uninitialized data to debug log file
Carl Byington <carl@five-ten-sg.com>
parents: 91
diff changeset
442 pst_debug_fwrite(&rec_type, sizeof(char), 1, debug_fp);
73
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them).
Carl Byington <carl@five-ten-sg.com>
parents: 70
diff changeset
443 pst_debug_fwrite(&lfile_rec, sizeof(lfile_rec), 1, debug_fp);
75
987aa872294e Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents: 73
diff changeset
444 fseeko(debug_fp, 0, SEEK_END);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
445 }
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
446
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
447
36
6fe121a971c9 valgrind fixes
carl
parents: 35
diff changeset
448 void *xmalloc(size_t size) {
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
449 void *mem = malloc(size);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
450 if (!mem) {
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
451 fprintf(stderr, "xMalloc: Out Of memory [req: %ld]\n", (long)size);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
452 exit(1);
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
453 }
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 43
diff changeset
454 return mem;
33
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
455 }
12cac756bc05 enable -d option, but if not specified, don't generate a debug file
carl
parents: 31
diff changeset
456