Skip to content

Commit cda8131

Browse files
mathieupoiriermathieupoirier
committed
perf tools: new naming convention for openCSD
The naming convention for the openCSD API and header files was changed so that using it was easier. Headers went from "rctdl_xyz.h" to "opencsd_xyz.h" while internal symbol from "rctdl_" to "ocsd_". Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
1 parent 69f2841 commit cda8131

1 file changed

Lines changed: 70 additions & 68 deletions

File tree

‎tools/perf/util/cs-etm-decoder/cs-etm-decoder.c‎

Lines changed: 70 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "cs-etm-decoder.h"
2222
#include "../util.h"
2323

24-
#include "c_api/rctdl_c_api.h"
25-
#include "rctdl_if_types.h"
24+
#include "c_api/opencsd_c_api.h"
25+
#include "ocsd_if_types.h"
2626
#include "etmv4/trc_pkt_types_etmv4.h"
2727

2828
#define MAX_BUFFER 1024
@@ -35,7 +35,7 @@ struct cs_etm_decoder
3535
dcd_tree_handle_t dcd_tree;
3636
void (*packet_printer)(const char *);
3737
cs_etm_mem_cb_type mem_access;
38-
rctdl_datapath_resp_t prev_return;
38+
ocsd_datapath_resp_t prev_return;
3939
size_t prev_processed;
4040
bool trace_on;
4141
bool discontinuity;
@@ -47,8 +47,8 @@ struct cs_etm_decoder
4747
};
4848

4949
static uint32_t cs_etm_decoder__mem_access(const void *context,
50-
const rctdl_vaddr_t address,
51-
const rctdl_mem_space_acc_t mem_space,
50+
const ocsd_vaddr_t address,
51+
const ocsd_mem_space_acc_t mem_space,
5252
const uint32_t req_size,
5353
uint8_t *buffer)
5454
{
@@ -59,7 +59,7 @@ static uint32_t cs_etm_decoder__mem_access(const void *context,
5959
}
6060

6161
static int cs_etm_decoder__gen_etmv4_config(struct cs_etm_trace_params *params,
62-
rctdl_etmv4_cfg *config)
62+
ocsd_etmv4_cfg *config)
6363
{
6464
config->reg_configr = params->reg_configr;
6565
config->reg_traceidr = params->reg_traceidr;
@@ -100,7 +100,9 @@ int cs_etm_decoder__flush(struct cs_etm_decoder *decoder)
100100
return cs_etm_decoder__flush_packet(decoder);
101101
}
102102

103-
static int cs_etm_decoder__buffer_packet(struct cs_etm_decoder *decoder, const rctdl_generic_trace_elem *elem, enum cs_etm_sample_type sample_type)
103+
static int cs_etm_decoder__buffer_packet(struct cs_etm_decoder *decoder,
104+
const ocsd_generic_trace_elem *elem,
105+
enum cs_etm_sample_type sample_type)
104106
{
105107
int err = 0;
106108
uint32_t et = 0;
@@ -149,48 +151,48 @@ static int cs_etm_decoder__mark_exception_return(struct cs_etm_decoder *decoder)
149151
return err;
150152
}
151153

152-
static rctdl_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer(
154+
static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer(
153155
const void *context,
154-
const rctdl_trc_index_t indx,
156+
const ocsd_trc_index_t indx,
155157
const uint8_t trace_chan_id,
156-
const rctdl_generic_trace_elem *elem)
158+
const ocsd_generic_trace_elem *elem)
157159
{
158-
rctdl_datapath_resp_t resp = RCTDL_RESP_CONT;
160+
ocsd_datapath_resp_t resp = OCSD_RESP_CONT;
159161
struct cs_etm_decoder *decoder = (struct cs_etm_decoder *) context;
160162

161163
(void) indx;
162164
(void) trace_chan_id;
163165

164166
switch (elem->elem_type) {
165-
case RCTDL_GEN_TRC_ELEM_UNKNOWN:
167+
case OCSD_GEN_TRC_ELEM_UNKNOWN:
166168
break;
167-
case RCTDL_GEN_TRC_ELEM_NO_SYNC:
169+
case OCSD_GEN_TRC_ELEM_NO_SYNC:
168170
decoder->trace_on = false;
169171
break;
170-
case RCTDL_GEN_TRC_ELEM_TRACE_ON:
172+
case OCSD_GEN_TRC_ELEM_TRACE_ON:
171173
decoder->trace_on = true;
172174
break;
173-
//case RCTDL_GEN_TRC_ELEM_TRACE_OVERFLOW:
175+
//case OCSD_GEN_TRC_ELEM_TRACE_OVERFLOW:
174176
//decoder->trace_on = false;
175177
//decoder->discontinuity = true;
176178
//break;
177-
case RCTDL_GEN_TRC_ELEM_INSTR_RANGE:
179+
case OCSD_GEN_TRC_ELEM_INSTR_RANGE:
178180
cs_etm_decoder__buffer_packet(decoder,elem, CS_ETM_RANGE);
179-
resp = RCTDL_RESP_WAIT;
181+
resp = OCSD_RESP_WAIT;
180182
break;
181-
case RCTDL_GEN_TRC_ELEM_EXCEPTION:
183+
case OCSD_GEN_TRC_ELEM_EXCEPTION:
182184
cs_etm_decoder__mark_exception(decoder);
183185
break;
184-
case RCTDL_GEN_TRC_ELEM_EXCEPTION_RET:
186+
case OCSD_GEN_TRC_ELEM_EXCEPTION_RET:
185187
cs_etm_decoder__mark_exception_return(decoder);
186188
break;
187-
case RCTDL_GEN_TRC_ELEM_PE_CONTEXT:
188-
case RCTDL_GEN_TRC_ELEM_EO_TRACE:
189-
case RCTDL_GEN_TRC_ELEM_ADDR_NACC:
190-
case RCTDL_GEN_TRC_ELEM_TIMESTAMP:
191-
case RCTDL_GEN_TRC_ELEM_CYCLE_COUNT:
192-
//case RCTDL_GEN_TRC_ELEM_TS_WITH_CC:
193-
case RCTDL_GEN_TRC_ELEM_EVENT:
189+
case OCSD_GEN_TRC_ELEM_PE_CONTEXT:
190+
case OCSD_GEN_TRC_ELEM_EO_TRACE:
191+
case OCSD_GEN_TRC_ELEM_ADDR_NACC:
192+
case OCSD_GEN_TRC_ELEM_TIMESTAMP:
193+
case OCSD_GEN_TRC_ELEM_CYCLE_COUNT:
194+
//case OCSD_GEN_TRC_ELEM_TS_WITH_CC:
195+
case OCSD_GEN_TRC_ELEM_EVENT:
194196
default:
195197
break;
196198
}
@@ -200,14 +202,14 @@ static rctdl_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer(
200202
return resp;
201203
}
202204

203-
static rctdl_datapath_resp_t cs_etm_decoder__etmv4i_packet_printer(
205+
static ocsd_datapath_resp_t cs_etm_decoder__etmv4i_packet_printer(
204206
const void *context,
205-
const rctdl_datapath_op_t op,
206-
const rctdl_trc_index_t indx,
207-
const rctdl_etmv4_i_pkt *pkt)
207+
const ocsd_datapath_op_t op,
208+
const ocsd_trc_index_t indx,
209+
const ocsd_etmv4_i_pkt *pkt)
208210
{
209211
const size_t PACKET_STR_LEN = 1024;
210-
rctdl_datapath_resp_t ret = RCTDL_RESP_CONT;
212+
ocsd_datapath_resp_t ret = OCSD_RESP_CONT;
211213
char packet_str[PACKET_STR_LEN];
212214
size_t offset;
213215
struct cs_etm_decoder *decoder = (struct cs_etm_decoder *) context;
@@ -216,18 +218,18 @@ static rctdl_datapath_resp_t cs_etm_decoder__etmv4i_packet_printer(
216218
offset = strlen(packet_str);
217219

218220
switch(op) {
219-
case RCTDL_OP_DATA:
220-
if (rctdl_pkt_str(RCTDL_PROTOCOL_ETMV4I,
221+
case OCSD_OP_DATA:
222+
if (ocsd_pkt_str(OCSD_PROTOCOL_ETMV4I,
221223
(void *)pkt,
222224
packet_str+offset,
223-
PACKET_STR_LEN-offset) != RCTDL_OK)
224-
ret = RCTDL_RESP_FATAL_INVALID_PARAM;
225+
PACKET_STR_LEN-offset) != OCSD_OK)
226+
ret = OCSD_RESP_FATAL_INVALID_PARAM;
225227
break;
226-
case RCTDL_OP_EOT:
228+
case OCSD_OP_EOT:
227229
sprintf(packet_str,"**** END OF TRACE ****\n");
228230
break;
229-
case RCTDL_OP_FLUSH:
230-
case RCTDL_OP_RESET:
231+
case OCSD_OP_FLUSH:
232+
case OCSD_OP_RESET:
231233
default:
232234
break;
233235
}
@@ -241,7 +243,7 @@ static int cs_etm_decoder__create_etmv4i_packet_printer(struct cs_etm_decoder_pa
241243

242244
struct cs_etm_decoder *decoder)
243245
{
244-
rctdl_etmv4_cfg trace_config;
246+
ocsd_etmv4_cfg trace_config;
245247
int ret = 0;
246248

247249
if (d_params->packet_printer == NULL)
@@ -254,7 +256,7 @@ static int cs_etm_decoder__create_etmv4i_packet_printer(struct cs_etm_decoder_pa
254256

255257
decoder->packet_printer = d_params->packet_printer;
256258

257-
ret = rctdl_dt_create_etmv4i_pkt_proc(decoder->dcd_tree,
259+
ret = ocsd_dt_create_etmv4i_pkt_proc(decoder->dcd_tree,
258260
&trace_config,
259261
cs_etm_decoder__etmv4i_packet_printer,
260262
decoder);
@@ -265,7 +267,7 @@ static int cs_etm_decoder__create_etmv4i_packet_printer(struct cs_etm_decoder_pa
265267
static int cs_etm_decoder__create_etmv4i_packet_decoder(struct cs_etm_decoder_params *d_params, struct cs_etm_trace_params *t_params,
266268
struct cs_etm_decoder *decoder)
267269
{
268-
rctdl_etmv4_cfg trace_config;
270+
ocsd_etmv4_cfg trace_config;
269271
int ret = 0;
270272
decoder->packet_printer = d_params->packet_printer;
271273

@@ -274,12 +276,12 @@ static int cs_etm_decoder__create_etmv4i_packet_decoder(struct cs_etm_decoder_pa
274276
if (ret != 0)
275277
return -1;
276278

277-
ret = rctdl_dt_create_etmv4i_decoder(decoder->dcd_tree,&trace_config);
279+
ret = ocsd_dt_create_etmv4i_decoder(decoder->dcd_tree,&trace_config);
278280

279-
if (ret != RCTDL_OK)
281+
if (ret != OCSD_OK)
280282
return -1;
281283

282-
ret = rctdl_dt_set_gen_elem_outfn(decoder->dcd_tree,
284+
ret = ocsd_dt_set_gen_elem_outfn(decoder->dcd_tree,
283285
cs_etm_decoder__gen_trace_elem_printer, decoder);
284286
return ret;
285287
}
@@ -289,10 +291,10 @@ int cs_etm_decoder__add_mem_access_cb(struct cs_etm_decoder *decoder, uint64_t a
289291
int err;
290292

291293
decoder->mem_access = cb_func;
292-
err = rctdl_dt_add_callback_mem_acc(decoder->dcd_tree,
294+
err = ocsd_dt_add_callback_mem_acc(decoder->dcd_tree,
293295
address,
294296
address+len-1,
295-
RCTDL_MEM_SPACE_ANY,
297+
OCSD_MEM_SPACE_ANY,
296298
cs_etm_decoder__mem_access,
297299
decoder);
298300
return err;
@@ -314,10 +316,10 @@ int cs_etm_decoder__add_bin_file(struct cs_etm_decoder *decoder, uint64_t offset
314316
region.file_offset = offset;
315317
region.start_address = address;
316318
region.region_size = len;
317-
err = rctdl_dt_add_binfile_region_mem_acc(decoder->dcd_tree,
319+
err = ocsd_dt_add_binfile_region_mem_acc(decoder->dcd_tree,
318320
&region,
319321
1,
320-
RCTDL_MEM_SPACE_ANY,
322+
OCSD_MEM_SPACE_ANY,
321323
fname);
322324

323325
return err;
@@ -330,7 +332,7 @@ const struct cs_etm_state *cs_etm_decoder__process_data_block(struct cs_etm_deco
330332
size_t *consumed)
331333
{
332334
int ret = 0;
333-
rctdl_datapath_resp_t dp_ret = decoder->prev_return;
335+
ocsd_datapath_resp_t dp_ret = decoder->prev_return;
334336
size_t processed = 0;
335337

336338
if (decoder->packet_count > 0) {
@@ -341,19 +343,19 @@ const struct cs_etm_state *cs_etm_decoder__process_data_block(struct cs_etm_deco
341343

342344
while ((processed < len) && (0 == ret)) {
343345

344-
if (RCTDL_DATA_RESP_IS_CONT(dp_ret)) {
346+
if (OCSD_DATA_RESP_IS_CONT(dp_ret)) {
345347
uint32_t count;
346-
dp_ret = rctdl_dt_process_data(decoder->dcd_tree,
347-
RCTDL_OP_DATA,
348+
dp_ret = ocsd_dt_process_data(decoder->dcd_tree,
349+
OCSD_OP_DATA,
348350
indx+processed,
349351
len - processed,
350352
&buf[processed],
351353
&count);
352354
processed += count;
353355

354-
} else if (RCTDL_DATA_RESP_IS_WAIT(dp_ret)) {
355-
dp_ret = rctdl_dt_process_data(decoder->dcd_tree,
356-
RCTDL_OP_FLUSH,
356+
} else if (OCSD_DATA_RESP_IS_WAIT(dp_ret)) {
357+
dp_ret = ocsd_dt_process_data(decoder->dcd_tree,
358+
OCSD_OP_FLUSH,
357359
0,
358360
0,
359361
NULL,
@@ -363,12 +365,12 @@ const struct cs_etm_state *cs_etm_decoder__process_data_block(struct cs_etm_deco
363365
ret = -1;
364366
}
365367
}
366-
if (RCTDL_DATA_RESP_IS_WAIT(dp_ret)) {
367-
if (RCTDL_DATA_RESP_IS_CONT(decoder->prev_return)) {
368+
if (OCSD_DATA_RESP_IS_WAIT(dp_ret)) {
369+
if (OCSD_DATA_RESP_IS_CONT(decoder->prev_return)) {
368370
decoder->prev_processed = processed;
369371
}
370372
processed = 0;
371-
} else if (RCTDL_DATA_RESP_IS_WAIT(decoder->prev_return)) {
373+
} else if (OCSD_DATA_RESP_IS_WAIT(decoder->prev_return)) {
372374
processed = decoder->prev_processed;
373375
decoder->prev_processed = 0;
374376
}
@@ -413,7 +415,7 @@ static void cs_etm_decoder__clear_buffer(struct cs_etm_decoder *decoder)
413415
struct cs_etm_decoder *cs_etm_decoder__new(uint32_t num_cpu, struct cs_etm_decoder_params *d_params, struct cs_etm_trace_params t_params[])
414416
{
415417
struct cs_etm_decoder *decoder;
416-
rctdl_dcd_tree_src_t format;
418+
ocsd_dcd_tree_src_t format;
417419
uint32_t flags;
418420
int ret;
419421
size_t i;
@@ -429,17 +431,17 @@ struct cs_etm_decoder *cs_etm_decoder__new(uint32_t num_cpu, struct cs_etm_decod
429431
}
430432

431433
decoder->state.data = d_params->data;
432-
decoder->prev_return = RCTDL_RESP_CONT;
434+
decoder->prev_return = OCSD_RESP_CONT;
433435
cs_etm_decoder__clear_buffer(decoder);
434-
format = (d_params->formatted ? RCTDL_TRC_SRC_FRAME_FORMATTED :
435-
RCTDL_TRC_SRC_SINGLE);
436+
format = (d_params->formatted ? OCSD_TRC_SRC_FRAME_FORMATTED :
437+
OCSD_TRC_SRC_SINGLE);
436438
flags = 0;
437-
flags |= (d_params->fsyncs ? RCTDL_DFRMTR_HAS_FSYNCS : 0);
438-
flags |= (d_params->hsyncs ? RCTDL_DFRMTR_HAS_HSYNCS : 0);
439-
flags |= (d_params->frame_aligned ? RCTDL_DFRMTR_FRAME_MEM_ALIGN : 0);
439+
flags |= (d_params->fsyncs ? OCSD_DFRMTR_HAS_FSYNCS : 0);
440+
flags |= (d_params->hsyncs ? OCSD_DFRMTR_HAS_HSYNCS : 0);
441+
flags |= (d_params->frame_aligned ? OCSD_DFRMTR_FRAME_MEM_ALIGN : 0);
440442

441443
/* Create decode tree for the data source */
442-
decoder->dcd_tree = rctdl_create_dcd_tree(format,flags);
444+
decoder->dcd_tree = ocsd_create_dcd_tree(format,flags);
443445

444446
if (decoder->dcd_tree == 0) {
445447
goto err_free_decoder;
@@ -470,7 +472,7 @@ struct cs_etm_decoder *cs_etm_decoder__new(uint32_t num_cpu, struct cs_etm_decod
470472
return decoder;
471473

472474
err_free_decoder_tree:
473-
rctdl_destroy_dcd_tree(decoder->dcd_tree);
475+
ocsd_destroy_dcd_tree(decoder->dcd_tree);
474476
err_free_decoder:
475477
free(decoder);
476478
return NULL;
@@ -481,7 +483,7 @@ void cs_etm_decoder__free(struct cs_etm_decoder *decoder)
481483
{
482484
if (decoder == NULL) return;
483485

484-
rctdl_destroy_dcd_tree(decoder->dcd_tree);
486+
ocsd_destroy_dcd_tree(decoder->dcd_tree);
485487
decoder->dcd_tree = NULL;
486488

487489
free(decoder);

0 commit comments

Comments
 (0)