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