Re: [Sched-tools] [PATCH 1/2] rt-parse: avoid repetition in obj_is_event()

Hi Javi,

+ Adding sched-tools

On 13 July 2016 at 15:07, Javi Merino javi.merino@arm.com wrote:

obj_is_event() is a boolean function that returns true if the name is an event. The two users of the function use it as a boolean function. The

seems reasonable to return bool instead of type

function has a lot of unnecessary copy&paste and duplication. Avoid repeating ourselves and just loop through all the events in an array.

fair enough

---

src/rt-app_parse_config.c | 54 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/rt-app_parse_config.c b/src/rt-app_parse_config.c index af18910..99b0e5e 100644 --- a/src/rt-app_parse_config.c +++ b/src/rt-app_parse_config.c @@ -550,37 +550,35 @@ unknown_event:

}

+static char *events[] = {

•   "lock",
  

•   "unlock",
  

•   "wait",
  

•   "signal",
  

•   "broad",
  

•   "sync",
  

•   "sleep",
  

•   "run",
  

•   "timer",
  

•   "suspend",
  

•   "resume",
  

•   "mem",
  

•   "iorun",
  

•   NULL
  

+};

static int obj_is_event(char *name) {

•   if (!strncmp(name, "lock", strlen("lock")))
  

•                   return rtapp_mutex;
  

•   if (!strncmp(name, "unlock", strlen("unlock")))
  

•                   return rtapp_lock;
  

•   if (!strncmp(name, "wait", strlen("wait")))
  

•                   return rtapp_unlock;
  

•   if (!strncmp(name, "signal", strlen("signal")))
  

•                   return rtapp_signal;
  

•   if (!strncmp(name, "broad", strlen("broad")))
  

•                   return rtapp_broadcast;
  

•   if (!strncmp(name, "sync", strlen("sync")))
  

•                   return rtapp_sig_and_wait;
  

•   if (!strncmp(name, "sleep", strlen("sleep")))
  

•                   return rtapp_sleep;
  

•   if (!strncmp(name, "run", strlen("run")))
  

•                   return rtapp_run;
  

•   if (!strncmp(name, "timer", strlen("timer")))
  

•                   return rtapp_timer;
  

•   if (!strncmp(name, "suspend", strlen("suspend")))
  

•                   return rtapp_suspend;
  

•   if (!strncmp(name, "resume", strlen("resume")))
  

•                   return rtapp_resume;
  

•   if (!strncmp(name, "mem", strlen("mem")))
  

•                   return rtapp_mem;
  

•   if (!strncmp(name, "iorun", strlen("iorun")))
  

•                   return rtapp_iorun;
  

•   return 0;
  

• char **pos;
• for (pos = events; *pos; pos++) {

•       char *event = *pos;
  

•       if (!strncmp(name, event, strlen(event)))
  

•               return 1;
  

• }
• return 0;

}

Looks good to me

Thanks

static void

1.9.1