Skip to content

Commit 98917a0

Browse files
Mattemagikernkartben
authored andcommitted
tracing: Remove retired k_pipe tracing api
The old k_pipe api was retired in #95408, the tracing hooks should be removed as well. Signed-off-by: Måns Ansgariusson <[email protected]>
1 parent 6deb989 commit 98917a0

File tree

5 files changed

+0
-186
lines changed

5 files changed

+0
-186
lines changed

include/zephyr/tracing/tracing.h

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,100 +1655,6 @@
16551655
*/
16561656
#define sys_port_trace_k_pipe_read_exit(pipe, ret)
16571657

1658-
/**
1659-
* @brief Trace Pipe cleanup entry
1660-
* @param pipe Pipe object
1661-
*/
1662-
#define sys_port_trace_k_pipe_cleanup_enter(pipe)
1663-
1664-
/**
1665-
* @brief Trace Pipe cleanup exit
1666-
* @param pipe Pipe object
1667-
* @param ret Return value
1668-
*/
1669-
#define sys_port_trace_k_pipe_cleanup_exit(pipe, ret)
1670-
1671-
/**
1672-
* @brief Trace Pipe alloc init entry
1673-
* @param pipe Pipe object
1674-
*/
1675-
#define sys_port_trace_k_pipe_alloc_init_enter(pipe)
1676-
1677-
/**
1678-
* @brief Trace Pipe alloc init exit
1679-
* @param pipe Pipe object
1680-
* @param ret Return value
1681-
*/
1682-
#define sys_port_trace_k_pipe_alloc_init_exit(pipe, ret)
1683-
1684-
/**
1685-
* @brief Trace Pipe flush entry
1686-
* @param pipe Pipe object
1687-
*/
1688-
#define sys_port_trace_k_pipe_flush_enter(pipe)
1689-
1690-
/**
1691-
* @brief Trace Pipe flush exit
1692-
* @param pipe Pipe object
1693-
*/
1694-
#define sys_port_trace_k_pipe_flush_exit(pipe)
1695-
1696-
/**
1697-
* @brief Trace Pipe buffer flush entry
1698-
* @param pipe Pipe object
1699-
*/
1700-
#define sys_port_trace_k_pipe_buffer_flush_enter(pipe)
1701-
1702-
/**
1703-
* @brief Trace Pipe buffer flush exit
1704-
* @param pipe Pipe object
1705-
*/
1706-
#define sys_port_trace_k_pipe_buffer_flush_exit(pipe)
1707-
1708-
/**
1709-
* @brief Trace Pipe put attempt entry
1710-
* @param pipe Pipe object
1711-
* @param timeout Timeout period
1712-
*/
1713-
#define sys_port_trace_k_pipe_put_enter(pipe, timeout)
1714-
1715-
/**
1716-
* @brief Trace Pipe put attempt blocking
1717-
* @param pipe Pipe object
1718-
* @param timeout Timeout period
1719-
*/
1720-
#define sys_port_trace_k_pipe_put_blocking(pipe, timeout)
1721-
1722-
/**
1723-
* @brief Trace Pipe put attempt outcome
1724-
* @param pipe Pipe object
1725-
* @param timeout Timeout period
1726-
* @param ret Return value
1727-
*/
1728-
#define sys_port_trace_k_pipe_put_exit(pipe, timeout, ret)
1729-
1730-
/**
1731-
* @brief Trace Pipe get attempt entry
1732-
* @param pipe Pipe object
1733-
* @param timeout Timeout period
1734-
*/
1735-
#define sys_port_trace_k_pipe_get_enter(pipe, timeout)
1736-
1737-
/**
1738-
* @brief Trace Pipe get attempt blocking
1739-
* @param pipe Pipe object
1740-
* @param timeout Timeout period
1741-
*/
1742-
#define sys_port_trace_k_pipe_get_blocking(pipe, timeout)
1743-
1744-
/**
1745-
* @brief Trace Pipe get attempt outcome
1746-
* @param pipe Pipe object
1747-
* @param timeout Timeout period
1748-
* @param ret Return value
1749-
*/
1750-
#define sys_port_trace_k_pipe_get_exit(pipe, timeout, ret)
1751-
17521658
/** @} */ /* end of subsys_tracing_apis_pipe */
17531659

17541660
/**

subsys/tracing/ctf/tracing_ctf.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -301,21 +301,6 @@ extern "C" {
301301
#define sys_port_trace_k_pipe_read_blocking(pipe, timeout)
302302
#define sys_port_trace_k_pipe_read_exit(pipe, ret)
303303

304-
#define sys_port_trace_k_pipe_cleanup_enter(pipe)
305-
#define sys_port_trace_k_pipe_cleanup_exit(pipe, ret)
306-
#define sys_port_trace_k_pipe_alloc_init_enter(pipe)
307-
#define sys_port_trace_k_pipe_alloc_init_exit(pipe, ret)
308-
#define sys_port_trace_k_pipe_flush_enter(pipe)
309-
#define sys_port_trace_k_pipe_flush_exit(pipe)
310-
#define sys_port_trace_k_pipe_buffer_flush_enter(pipe)
311-
#define sys_port_trace_k_pipe_buffer_flush_exit(pipe)
312-
#define sys_port_trace_k_pipe_put_enter(pipe, timeout)
313-
#define sys_port_trace_k_pipe_put_blocking(pipe, timeout)
314-
#define sys_port_trace_k_pipe_put_exit(pipe, timeout, ret)
315-
#define sys_port_trace_k_pipe_get_enter(pipe, timeout)
316-
#define sys_port_trace_k_pipe_get_blocking(pipe, timeout)
317-
#define sys_port_trace_k_pipe_get_exit(pipe, timeout, ret)
318-
319304
#define sys_port_trace_k_heap_init(heap)
320305
#define sys_port_trace_k_heap_aligned_alloc_enter(heap, timeout)
321306
#define sys_port_trace_k_heap_alloc_helper_blocking(heap, timeout)

subsys/tracing/sysview/tracing_sysview.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -547,21 +547,6 @@ void sys_trace_thread_info(struct k_thread *thread);
547547
#define sys_port_trace_k_pipe_read_blocking(pipe, timeout)
548548
#define sys_port_trace_k_pipe_read_exit(pipe, ret)
549549

550-
#define sys_port_trace_k_pipe_cleanup_enter(pipe)
551-
#define sys_port_trace_k_pipe_cleanup_exit(pipe, ret)
552-
#define sys_port_trace_k_pipe_alloc_init_enter(pipe)
553-
#define sys_port_trace_k_pipe_alloc_init_exit(pipe, ret)
554-
#define sys_port_trace_k_pipe_flush_enter(pipe)
555-
#define sys_port_trace_k_pipe_flush_exit(pipe)
556-
#define sys_port_trace_k_pipe_buffer_flush_enter(pipe)
557-
#define sys_port_trace_k_pipe_buffer_flush_exit(pipe)
558-
#define sys_port_trace_k_pipe_put_enter(pipe, timeout)
559-
#define sys_port_trace_k_pipe_put_blocking(pipe, timeout)
560-
#define sys_port_trace_k_pipe_put_exit(pipe, timeout, ret)
561-
#define sys_port_trace_k_pipe_get_enter(pipe, timeout)
562-
#define sys_port_trace_k_pipe_get_blocking(pipe, timeout)
563-
#define sys_port_trace_k_pipe_get_exit(pipe, timeout, ret)
564-
565550
#define sys_port_trace_k_event_init(event)
566551
#define sys_port_trace_k_event_post_enter(event, events, events_mask)
567552
#define sys_port_trace_k_event_post_exit(event, events, events_mask)

subsys/tracing/test/tracing_test.h

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -368,31 +368,6 @@
368368
#define sys_port_trace_k_pipe_read_exit(pipe, ret) \
369369
sys_trace_k_pipe_read_exit(pipe, ret)
370370

371-
#define sys_port_trace_k_pipe_cleanup_enter(pipe) sys_trace_k_pipe_cleanup_enter(pipe)
372-
#define sys_port_trace_k_pipe_cleanup_exit(pipe, ret) sys_trace_k_pipe_cleanup_exit(pipe, ret)
373-
#define sys_port_trace_k_pipe_alloc_init_enter(pipe) sys_trace_k_pipe_alloc_init_enter(pipe, size)
374-
#define sys_port_trace_k_pipe_alloc_init_exit(pipe, ret) \
375-
sys_trace_k_pipe_alloc_init_exit(pipe, size, ret)
376-
#define sys_port_trace_k_pipe_flush_enter(pipe) sys_trace_k_pipe_flush_enter(pipe)
377-
#define sys_port_trace_k_pipe_flush_exit(pipe) sys_trace_k_pipe_flush_exit(pipe)
378-
#define sys_port_trace_k_pipe_buffer_flush_enter(pipe) \
379-
sys_trace_k_pipe_buffer_flush_enter(pipe)
380-
#define sys_port_trace_k_pipe_buffer_flush_exit(pipe) \
381-
sys_trace_k_pipe_buffer_flush_exit(pipe)
382-
383-
#define sys_port_trace_k_pipe_put_enter(pipe, timeout) \
384-
sys_trace_k_pipe_put_enter(pipe, data, bytes_to_write, bytes_written, min_xfer, timeout)
385-
#define sys_port_trace_k_pipe_put_blocking(pipe, timeout) \
386-
sys_trace_k_pipe_put_blocking(pipe, data, bytes_to_write, bytes_written, min_xfer, timeout)
387-
#define sys_port_trace_k_pipe_put_exit(pipe, timeout, ret) \
388-
sys_trace_k_pipe_put_exit(pipe, data, bytes_to_write, bytes_written, min_xfer, timeout, ret)
389-
#define sys_port_trace_k_pipe_get_enter(pipe, timeout) \
390-
sys_trace_k_pipe_get_enter(pipe, data, bytes_to_read, bytes_read, min_xfer, timeout)
391-
#define sys_port_trace_k_pipe_get_blocking(pipe, timeout) \
392-
sys_trace_k_pipe_get_blocking(pipe, data, bytes_to_read, bytes_read, min_xfer, timeout)
393-
#define sys_port_trace_k_pipe_get_exit(pipe, timeout, ret) \
394-
sys_trace_k_pipe_get_exit(pipe, data, bytes_to_read, bytes_read, min_xfer, timeout, ret)
395-
396371
#define sys_port_trace_k_heap_init(h) sys_trace_k_heap_init(h, mem, bytes)
397372
#define sys_port_trace_k_heap_aligned_alloc_enter(h, timeout) \
398373
sys_trace_k_heap_aligned_alloc_enter(h, bytes, timeout)
@@ -661,28 +636,6 @@ void sys_trace_k_pipe_read_enter(struct k_pipe *pipe, const void *data, size_t l
661636
void sys_trace_k_pipe_read_blocking(struct k_pipe *pipe, k_timeout_t timeout);
662637
void sys_trace_k_pipe_read_exit(struct k_pipe *pipe, int ret);
663638

664-
void sys_trace_k_pipe_cleanup_enter(struct k_pipe *pipe);
665-
void sys_trace_k_pipe_cleanup_exit(struct k_pipe *pipe, int ret);
666-
void sys_trace_k_pipe_alloc_init_enter(struct k_pipe *pipe, size_t size);
667-
void sys_trace_k_pipe_alloc_init_exit(struct k_pipe *pipe, size_t size, int ret);
668-
void sys_trace_k_pipe_flush_enter(struct k_pipe *pipe);
669-
void sys_trace_k_pipe_flush_exit(struct k_pipe *pipe);
670-
void sys_trace_k_pipe_buffer_flush_enter(struct k_pipe *pipe);
671-
void sys_trace_k_pipe_buffer_flush_exit(struct k_pipe *pipe);
672-
void sys_trace_k_pipe_put_enter(struct k_pipe *pipe, const void *data, size_t bytes_to_write,
673-
size_t *bytes_written, size_t min_xfer, k_timeout_t timeout);
674-
void sys_trace_k_pipe_put_blocking(struct k_pipe *pipe, const void *data, size_t bytes_to_write,
675-
size_t *bytes_written, size_t min_xfer, k_timeout_t timeout);
676-
void sys_trace_k_pipe_put_exit(struct k_pipe *pipe, const void *data, size_t bytes_to_write,
677-
size_t *bytes_written, size_t min_xfer, k_timeout_t timeout,
678-
int ret);
679-
void sys_trace_k_pipe_get_enter(struct k_pipe *pipe, void *data, size_t bytes_to_read,
680-
size_t *bytes_read, size_t min_xfer, k_timeout_t timeout);
681-
void sys_trace_k_pipe_get_blocking(struct k_pipe *pipe, void *data, size_t bytes_to_read,
682-
size_t *bytes_read, size_t min_xfer, k_timeout_t timeout);
683-
void sys_trace_k_pipe_get_exit(struct k_pipe *pipe, void *data, size_t bytes_to_read,
684-
size_t *bytes_read, size_t min_xfer, k_timeout_t timeout, int ret);
685-
686639
void sys_trace_k_msgq_init(struct k_msgq *msgq);
687640
void sys_trace_k_msgq_alloc_init_enter(struct k_msgq *msgq, size_t msg_size, uint32_t max_msgs);
688641
void sys_trace_k_msgq_alloc_init_exit(struct k_msgq *msgq, size_t msg_size, uint32_t max_msgs,

subsys/tracing/user/tracing_user.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -338,21 +338,6 @@ void sys_trace_gpio_fire_callback_user(const struct device *port, struct gpio_ca
338338
#define sys_port_trace_k_pipe_read_blocking(pipe, timeout)
339339
#define sys_port_trace_k_pipe_read_exit(pipe, ret)
340340

341-
#define sys_port_trace_k_pipe_cleanup_enter(pipe)
342-
#define sys_port_trace_k_pipe_cleanup_exit(pipe, ret)
343-
#define sys_port_trace_k_pipe_alloc_init_enter(pipe)
344-
#define sys_port_trace_k_pipe_alloc_init_exit(pipe, ret)
345-
#define sys_port_trace_k_pipe_flush_enter(pipe)
346-
#define sys_port_trace_k_pipe_flush_exit(pipe)
347-
#define sys_port_trace_k_pipe_buffer_flush_enter(pipe)
348-
#define sys_port_trace_k_pipe_buffer_flush_exit(pipe)
349-
#define sys_port_trace_k_pipe_put_enter(pipe, timeout)
350-
#define sys_port_trace_k_pipe_put_blocking(pipe, timeout)
351-
#define sys_port_trace_k_pipe_put_exit(pipe, timeout, ret)
352-
#define sys_port_trace_k_pipe_get_enter(pipe, timeout)
353-
#define sys_port_trace_k_pipe_get_blocking(pipe, timeout)
354-
#define sys_port_trace_k_pipe_get_exit(pipe, timeout, ret)
355-
356341
#define sys_port_trace_k_heap_init(heap)
357342
#define sys_port_trace_k_heap_aligned_alloc_enter(heap, timeout)
358343
#define sys_port_trace_k_heap_alloc_helper_blocking(heap, timeout)

0 commit comments

Comments
 (0)