From a92a3841af62e5963a584480abefdbde4eeada45 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 17 Jan 2011 01:55:08 -0500 Subject: [PATCH] Remove deprecated code Signed-off-by: Mathieu Desnoyers --- ltt-filter.c => discard/ltt-filter.c | 0 ltt-kprobes.c => discard/ltt-kprobes.c | 0 ltt-statedump.c => discard/ltt-statedump.c | 0 .../ltt-trace-control.c | 0 .../ltt-userspace-event.c | 0 ltt-tracer.h | 129 ------------------ 6 files changed, 129 deletions(-) rename ltt-filter.c => discard/ltt-filter.c (100%) rename ltt-kprobes.c => discard/ltt-kprobes.c (100%) rename ltt-statedump.c => discard/ltt-statedump.c (100%) rename ltt-trace-control.c => discard/ltt-trace-control.c (100%) rename ltt-userspace-event.c => discard/ltt-userspace-event.c (100%) diff --git a/ltt-filter.c b/discard/ltt-filter.c similarity index 100% rename from ltt-filter.c rename to discard/ltt-filter.c diff --git a/ltt-kprobes.c b/discard/ltt-kprobes.c similarity index 100% rename from ltt-kprobes.c rename to discard/ltt-kprobes.c diff --git a/ltt-statedump.c b/discard/ltt-statedump.c similarity index 100% rename from ltt-statedump.c rename to discard/ltt-statedump.c diff --git a/ltt-trace-control.c b/discard/ltt-trace-control.c similarity index 100% rename from ltt-trace-control.c rename to discard/ltt-trace-control.c diff --git a/ltt-userspace-event.c b/discard/ltt-userspace-event.c similarity index 100% rename from ltt-userspace-event.c rename to discard/ltt-userspace-event.c diff --git a/ltt-tracer.h b/ltt-tracer.h index 84b3731f..2f947b7e 100644 --- a/ltt-tracer.h +++ b/ltt-tracer.h @@ -72,71 +72,6 @@ enum ltt_channels { LTT_CHANNEL_DEFAULT, }; -#if 0 -size_t ltt_serialize_printf(struct lib_ring_buffer *buf, unsigned long buf_offset, - size_t *msg_size, char *output, size_t outlen, - const char *fmt); - -/* - * Unique ID assigned to each registered probe. - */ -enum marker_id { - MARKER_ID_SET_MARKER_ID = 0, /* Static IDs available (range 0-7) */ - MARKER_ID_SET_MARKER_FORMAT, - MARKER_ID_COMPACT, /* Compact IDs (range: 8-127) */ - MARKER_ID_DYNAMIC, /* Dynamic IDs (range: 128-65535) */ -}; - -/* static ids 0-1 reserved for internal use. */ -#define MARKER_CORE_IDS 2 -static __inline__ enum marker_id marker_id_type(uint16_t id) -{ - if (id < MARKER_CORE_IDS) - return (enum marker_id)id; - else - return MARKER_ID_DYNAMIC; -} - -struct user_dbg_data { - unsigned long avail_size; - unsigned long write; - unsigned long read; -}; - -enum trace_mode { LTT_TRACE_NORMAL, LTT_TRACE_FLIGHT, LTT_TRACE_HYBRID }; - -#define CHANNEL_FLAG_ENABLE (1U<<0) -#define CHANNEL_FLAG_OVERWRITE (1U<<1) -#endif //0 - -#if 0 -/* Per-trace information - each trace/flight recorder represented by one */ -struct ltt_trace { - /* First 32 bytes cache-hot cacheline */ - struct list_head list; - struct ltt_chan **channels; - unsigned int nr_channels; - int active; - /* Second 32 bytes cache-hot cacheline */ - struct ltt_trace_ops *ops; - u32 freq_scale; - u64 start_freq; - u64 start_tsc; - unsigned long long start_monotonic; - struct timeval start_time; - struct ltt_channel_setting *settings; - struct { - struct dentry *trace_root; - struct dentry *ascii_root; - } dentry; - struct kref kref; /* Each channel has a kref of the trace struct */ - struct ltt_transport *transport; - struct kref ltt_transport_kref; - wait_queue_head_t kref_wq; /* Place for ltt_trace_destroy to sleep */ - char trace_name[NAME_MAX]; -} ____cacheline_aligned; -#endif //0 - /* * Hardcoded event headers * @@ -326,70 +261,6 @@ slow_path: ltt_write_event_header_slow(config, ctx, eID, event_size); } -#if 0 -/* - * ltt_read_event_header - * buf_offset must aligned on 32 bits - */ -static __inline__ -size_t ltt_read_event_header(struct ltt_chanbuf_alloc *bufa, long buf_offset, - u64 *tsc, u32 *event_size, u16 *eID, - unsigned int *rflags) -{ - struct ltt_event_header header; - u16 small_size; - - ltt_relay_read(bufa, buf_offset, &header, sizeof(header)); - buf_offset += sizeof(header); - - *event_size = INT_MAX; - *eID = header.id_time >> LTT_TSC_BITS; - *tsc = header.id_time & LTT_TSC_MASK; - - switch (*eID) { - case 29: - *rflags = LTT_RFLAG_ID_SIZE_TSC; - ltt_relay_read(bufa, buf_offset, eID, sizeof(u16)); - buf_offset += sizeof(u16); - ltt_relay_read(bufa, buf_offset, &small_size, sizeof(u16)); - buf_offset += sizeof(u16); - if (small_size == LTT_MAX_SMALL_SIZE) { - ltt_relay_read(bufa, buf_offset, event_size, - sizeof(u32)); - buf_offset += sizeof(u32); - } else - *event_size = small_size; - buf_offset += ltt_align(buf_offset, sizeof(u64)); - ltt_relay_read(bufa, buf_offset, tsc, sizeof(u64)); - buf_offset += sizeof(u64); - break; - case 30: - *rflags = LTT_RFLAG_ID_SIZE; - ltt_relay_read(bufa, buf_offset, eID, sizeof(u16)); - buf_offset += sizeof(u16); - ltt_relay_read(bufa, buf_offset, &small_size, sizeof(u16)); - buf_offset += sizeof(u16); - if (small_size == LTT_MAX_SMALL_SIZE) { - ltt_relay_read(bufa, buf_offset, event_size, - sizeof(u32)); - buf_offset += sizeof(u32); - } else - *event_size = small_size; - break; - case 31: - *rflags = LTT_RFLAG_ID; - ltt_relay_read(bufa, buf_offset, eID, sizeof(u16)); - buf_offset += sizeof(u16); - break; - default: - *rflags = 0; - break; - } - - return buf_offset; -} -#endif //0 - /* Tracer properties */ #define CTF_MAGIC_NUMBER 0xC1FC1FC1 #define LTT_TRACER_VERSION_MAJOR 3 -- 2.34.1