Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fec1dfac authored by Todd Kjos's avatar Todd Kjos
Browse files

ANDROID: simplify vendor hooks for non-GKI builds 



Vendor hooks required explicitly defining macros or inline functions
to handle the non-GKI build case (!CONFIG_ANDROID_VENDOR_HOOKS). Added
support for generating them automatically so the macros are no longer
required.

Both models are now supported so we can transition.

Bug: 177416721
Signed-off-by: default avatarTodd Kjos <tkjos@google.com>
Change-Id: I01acc389d315a5d509b0c48116854342a42e1058
parent 5327444e

include/trace/hooks/sched.h

+3 −17
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 * Following tracepoints are not exported in tracefs and provide a

 * mechanism for vendor modules to hook and extend functionality

 */

#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)

struct task_struct;

DECLARE_RESTRICTED_HOOK(android_rvh_select_task_rq_fair,

	TP_PROTO(struct task_struct *p, int prev_cpu, int sd_flag, int wake_flags, int *new_cpu),
@@ -70,22 +69,9 @@ struct sched_group; 
DECLARE_RESTRICTED_HOOK(android_rvh_find_busiest_group,

	TP_PROTO(struct sched_group *busiest, struct rq *dst_rq, int *out_balance),

		TP_ARGS(busiest, dst_rq, out_balance), 1);

#else

#define trace_android_rvh_select_task_rq_fair(p, prev_cpu, sd_flag, wake_flags, new_cpu)

#define trace_android_rvh_select_task_rq_rt(p, prev_cpu, sd_flag, wake_flags, new_cpu)

#define trace_android_rvh_select_fallback_rq(cpu, p, dest_cpu)

#define trace_android_vh_scheduler_tick(rq)

#define trace_android_rvh_enqueue_task(rq, p)

#define trace_android_rvh_dequeue_task(rq, p)

#define trace_android_rvh_can_migrate_task(p, dst_cpu, can_migrate)

#define trace_android_rvh_find_lowest_rq(p, local_cpu_mask, lowest_cpu)

#define trace_android_rvh_prepare_prio_fork(p)

#define trace_android_rvh_finish_prio_fork(p)

#define trace_android_rvh_rtmutex_prepare_setprio(p, pi_task)

#define trace_android_rvh_set_user_nice(p, nice)

#define trace_android_rvh_setscheduler(p)

#define trace_android_rvh_find_busiest_group(busiest, dst_rq, out_balance)

#endif



/* macro versions of hooks are no longer required */



#endif /* _TRACE_HOOK_SCHED_H */

/* This part must be outside protection */

#include <trace/define_trace.h>

include/trace/hooks/vendor_hooks.h

+9 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 


#include <linux/tracepoint.h>



#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)



#define DECLARE_HOOK DECLARE_TRACE



#ifdef TRACE_HEADER_MULTI_READ
@@ -74,3 +76,10 @@ 
			PARAMS(__data, args))



#endif /* TRACE_HEADER_MULTI_READ */



#else /* !CONFIG_TRACEPOINTS || !CONFIG_ANDROID_VENDOR_HOOKS */

/* suppress trace hooks */

#define DECLARE_HOOK DECLARE_EVENT_NOP

#define DECLARE_RESTRICTED_HOOK(name, proto, args, cond)		\

	DECLARE_EVENT_NOP(name, PARAMS(proto), PARAMS(args))

#endif