annotate src/debug.c @ 146:0695de3b5a98 stable-0-6-29

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