1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
|
Rename __no_instrument_function__ macro to avoid conficting redefinitions
of the same symbol.
Upstream-Status: Pending
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Index: DirectFB-1.6.1/lib/direct/clock.c
===================================================================
--- DirectFB-1.6.1.orig/lib/direct/clock.c 2012-06-29 19:01:11.000000000 +0300
+++ DirectFB-1.6.1/lib/direct/clock.c 2013-01-05 18:03:24.000000000 +0200
@@ -36,28 +36,28 @@
/**********************************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
long long
direct_clock_get_micros( void )
{
return direct_clock_get_time( DIRECT_CLOCK_SESSION );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
long long
direct_clock_get_millis( void )
{
return direct_clock_get_time( DIRECT_CLOCK_SESSION ) / 1000LL;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
long long
direct_clock_get_abs_micros( void )
{
return direct_clock_get_time( DIRECT_CLOCK_REALTIME );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
long long
direct_clock_get_abs_millis( void )
{
Index: DirectFB-1.6.1/lib/direct/debug.c
===================================================================
--- DirectFB-1.6.1.orig/lib/direct/debug.c 2012-06-29 19:01:11.000000000 +0300
+++ DirectFB-1.6.1/lib/direct/debug.c 2013-01-05 18:03:49.000000000 +0200
@@ -48,7 +48,7 @@
#if DIRECT_BUILD_DEBUGS /* Build with debug support? */
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_debug_log( DirectLogDomain *domain,
unsigned int debug_level, /* 1-9, 0 = info */
@@ -63,7 +63,7 @@
va_end( ap );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_debug_at( DirectLogDomain *domain,
const char *format, ... )
@@ -77,7 +77,7 @@
#endif /* DIRECT_BUILD_DEBUGS */
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_debug_at_always( DirectLogDomain *domain,
const char *format, ... )
@@ -93,7 +93,7 @@
#if DIRECT_BUILD_DEBUGS /* Build with debug support? */
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_break( const char *func,
const char *file,
@@ -123,7 +123,7 @@
direct_trap( "Break", SIGABRT );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_assertion( const char *exp,
const char *func,
@@ -144,7 +144,7 @@
direct_trap( "Assertion", SIGTRAP );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_assumption( const char *exp,
const char *func,
Index: DirectFB-1.6.1/lib/direct/interface.c
===================================================================
--- DirectFB-1.6.1.orig/lib/direct/interface.c 2012-06-29 19:01:11.000000000 +0300
+++ DirectFB-1.6.1/lib/direct/interface.c 2013-01-05 18:04:56.000000000 +0200
@@ -522,7 +522,7 @@
/**************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
static InterfaceDesc *
allocate_interface_desc( void )
{
@@ -543,7 +543,7 @@
return &alloc_list[alloc_count++];
}
-__no_instrument_function__
+__dfb_no_instrument_function__
static __inline__ void
fill_interface_desc( InterfaceDesc *desc,
const void *interface_ptr,
@@ -565,7 +565,7 @@
/**************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_dbg_interface_add( const char *func,
const char *file,
@@ -586,7 +586,7 @@
direct_mutex_unlock( &alloc_lock );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_dbg_interface_remove( const char *func,
const char *file,
Index: DirectFB-1.6.1/lib/direct/log.c
===================================================================
--- DirectFB-1.6.1.orig/lib/direct/log.c 2012-06-29 19:01:11.000000000 +0300
+++ DirectFB-1.6.1/lib/direct/log.c 2013-01-05 18:04:18.000000000 +0200
@@ -128,7 +128,7 @@
return DR_OK;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
DirectResult
direct_log_printf( DirectLog *log,
const char *format, ... )
@@ -197,7 +197,7 @@
return DR_OK;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_log_lock( DirectLog *log )
{
@@ -211,7 +211,7 @@
direct_mutex_lock( &log->lock );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_log_unlock( DirectLog *log )
{
@@ -262,7 +262,7 @@
/**********************************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
DirectLog *
direct_log_default( void )
{
Index: DirectFB-1.6.1/lib/direct/log_domain.c
===================================================================
--- DirectFB-1.6.1.orig/lib/direct/log_domain.c 2012-06-29 19:01:11.000000000 +0300
+++ DirectFB-1.6.1/lib/direct/log_domain.c 2013-01-05 18:04:38.000000000 +0200
@@ -69,7 +69,7 @@
/**********************************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
static __inline__ LogDomainEntry *
lookup_domain( const char *name, bool sub );
@@ -104,7 +104,7 @@
return NULL;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
static DirectLogLevel
check_domain( DirectLogDomain *domain );
@@ -207,7 +207,7 @@
/* FIXME: merge following */
-__no_instrument_function__
+__dfb_no_instrument_function__
DirectResult
direct_log_domain_vprintf( DirectLogDomain *domain,
DirectLogLevel level,
@@ -268,7 +268,7 @@
return DR_OK;
}
-__no_instrument_function__
+__dfb_no_instrument_function__
DirectResult
direct_log_domain_log( DirectLogDomain *domain,
DirectLogLevel level,
Index: DirectFB-1.6.1/lib/direct/mem.c
===================================================================
--- DirectFB-1.6.1.orig/lib/direct/mem.c 2012-06-29 19:01:11.000000000 +0300
+++ DirectFB-1.6.1/lib/direct/mem.c 2013-01-05 18:03:08.000000000 +0200
@@ -121,7 +121,7 @@
/**********************************************************************************************************************/
-__no_instrument_function__
+__dfb_no_instrument_function__
static __inline__ MemDesc *
fill_mem_desc( MemDesc *desc, int bytes, const char *func, const char *file, int line, DirectTraceBuffer *trace )
{
Index: DirectFB-1.6.1/lib/direct/messages.c
===================================================================
--- DirectFB-1.6.1.orig/lib/direct/messages.c 2012-06-29 19:01:11.000000000 +0300
+++ DirectFB-1.6.1/lib/direct/messages.c 2013-01-05 18:02:57.000000000 +0200
@@ -40,7 +40,7 @@
#if DIRECT_BUILD_TEXT
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_info( const char *format, ... )
{
@@ -57,7 +57,7 @@
direct_log_printf( NULL, "(*) %s", buf );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_error( const char *format, ... )
{
@@ -76,7 +76,7 @@
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_derror( DirectResult result, const char *format, ... )
{
@@ -95,7 +95,7 @@
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_perror( int erno, const char *format, ... )
{
@@ -114,7 +114,7 @@
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_dlerror( const char *dlerr, const char *format, ... )
{
@@ -133,7 +133,7 @@
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_once( const char *func,
const char *file,
@@ -155,7 +155,7 @@
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_unimplemented( const char *func,
const char *file,
@@ -166,7 +166,7 @@
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_bug( const char *func,
const char *file,
@@ -188,7 +188,7 @@
direct_trace_print_stack( NULL );
}
-__no_instrument_function__
+__dfb_no_instrument_function__
void
direct_messages_warn( const char *func,
const char *file,
Index: DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h
===================================================================
--- DirectFB-1.6.1.orig/lib/direct/os/linux/glibc/types.h 2012-06-29 19:01:11.000000000 +0300
+++ DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h 2013-01-05 18:06:04.000000000 +0200
@@ -74,7 +74,7 @@
#define __inline__ inline
#define D_UNUSED __attribute__((unused))
-#define __no_instrument_function__ __attribute__((no_instrument_function))
+#define __dfb_no_instrument_function__ __attribute__((no_instrument_function))
#define __constructor__ __attribute__((constructor))
#define __destructor__ __attribute__((destructor))
#define __typeof__(x) typeof(x)
Index: DirectFB-1.6.1/lib/direct/util.c
===================================================================
--- DirectFB-1.6.1.orig/lib/direct/util.c 2012-06-29 19:01:11.000000000 +0300
+++ DirectFB-1.6.1/lib/direct/util.c 2013-01-05 18:03:59.000000000 +0200
@@ -110,7 +110,7 @@
/*
* translates errno to DirectResult
*/
-__no_instrument_function__
+__dfb_no_instrument_function__
DirectResult
errno2result( int erno )
{
|
