__thread long ust_reg_stack[500];
volatile __thread long *ust_reg_stack_ptr = (long *) 0;
-extern struct marker * const __start___markers[] __attribute__((visibility("hidden")));
-extern struct marker * const __stop___markers[] __attribute__((visibility("hidden")));
+extern struct marker * const __start___markers_ptrs[] __attribute__((visibility("hidden")));
+extern struct marker * const __stop___markers_ptrs[] __attribute__((visibility("hidden")));
/* Set to 1 to enable marker debug output */
static const int marker_debug;
*/
static void marker_update_probes(void)
{
- /* Core kernel markers */
-//ust// marker_update_probe_range(__start___markers, __stop___markers);
- /* Markers in modules. */
-//ust// module_update_markers();
lib_update_markers();
tracepoint_probe_update_all();
/* Update immediate values */
{
int found = 0;
- /* Core kernel markers */
- if (!iter->lib) {
- /* ust FIXME: how come we cannot disable the following line? we shouldn't need core stuff */
- found = marker_get_iter_range(&iter->marker,
- __start___markers, __stop___markers);
- if (found)
- goto end;
- }
- /* Markers in modules. */
found = lib_get_iter_markers(iter);
-end:
if (!found)
marker_iter_reset(iter);
}
int marker_register_lib(struct marker * const *markers_start, int markers_count)
{
- struct lib *pl;
+ struct lib *pl, *iter;
pl = (struct lib *) zmalloc(sizeof(struct lib));
/* FIXME: maybe protect this with its own mutex? */
lock_markers();
+
+ /*
+ * We sort the libs by struct lib pointer address.
+ */
+ cds_list_for_each_entry_reverse(iter, &libs, list) {
+ BUG_ON(iter == pl); /* Should never be in the list twice */
+ if (iter < pl) {
+ /* We belong to the location right after iter. */
+ cds_list_add(&pl->list, &iter->list);
+ goto lib_added;
+ }
+ }
+ /* We should be added at the head of the list */
cds_list_add(&pl->list, &libs);
+lib_added:
unlock_markers();
new_markers(markers_start, markers_start + markers_count);
void __attribute__((constructor)) init_markers(void)
{
- if(!initialized) {
- marker_register_lib(__start___markers,
- (((long)__stop___markers) - ((long)__start___markers))
- / sizeof(*__start___markers));
+ if (!initialized) {
+ marker_register_lib(__start___markers_ptrs,
+ __stop___markers_ptrs
+ - __start___markers_ptrs);
initialized = 1;
}
}
void __attribute__((constructor)) destroy_markers(void)
{
- marker_unregister_lib(__start___markers);
+ marker_unregister_lib(__start___markers_ptrs);
}