4,7 → 4,7 |
#include <stdio.h> |
#include "parser.h" |
|
#define PARSER_DEBUG |
//#define PARSER_DEBUG |
|
static int find_break(char **buf, int find_type, struct timespec *time, int *val) |
{ |
109,14 → 109,14 |
*val = PAR_ACT_MEAN; |
return PAR_FOUND; |
} |
if (!strncmp(*buf,"ACT_EXP(",8)) { |
*buf += 8; |
*val = PAR_ACT_EXP; |
if (!strncmp(*buf,"ACT_GAUSS(",10)) { |
*buf += 10; |
*val = PAR_ACT_GAUSS; |
return PAR_FOUND;; |
} |
if (!strncmp(*buf,"ACT_EXP_MAX(",12)) { |
*buf += 12; |
*val = PAR_ACT_EXP_MAX; |
if (!strncmp(*buf,"ACT_GAUSS_MAX(",14)) { |
*buf += 14; |
*val = PAR_ACT_GAUSS_MAX; |
return PAR_FOUND; |
} |
return PAR_ERROR; |
133,14 → 133,14 |
*val = PAR_EXEC_MEAN; |
return PAR_FOUND; |
} |
if (!strncmp(*buf,"EXEC_EXP(",9)) { |
*buf += 9; |
*val = PAR_EXEC_EXP; |
if (!strncmp(*buf,"EXEC_GAUSS(",11)) { |
*buf += 11; |
*val = PAR_EXEC_GAUSS; |
return PAR_FOUND; |
} |
if (!strncmp(*buf,"EXEC_EXP_MAX(",13)) { |
*buf += 13; |
*val = PAR_EXEC_EXP_MAX; |
if (!strncmp(*buf,"EXEC_GAUSS_MAX(",15)) { |
*buf += 15; |
*val = PAR_EXEC_GAUSS_MAX; |
return PAR_FOUND; |
} |
return PAR_ERROR; |
261,7 → 261,7 |
} |
|
if (ld->act_type != PAR_ACT_SINGLE && ld->act_type != PAR_ACT_PERIODIC && |
ld->act_type != PAR_ACT_MEAN && ld->act_type != PAR_ACT_EXP) { |
ld->act_type != PAR_ACT_MEAN && ld->act_type != PAR_ACT_GAUSS) { |
res = find_break(&pbuf,PAR_TIME, &time, &val); |
if (res == PAR_FOUND) { |
#ifdef PARSER_DEBUG |
280,6 → 280,14 |
res = find_break(&pbuf,PAR_TIME, &time, &val); |
if (res == PAR_FOUND) { |
#ifdef PARSER_DEBUG |
cprintf("DEADLINE: [%ld][%ld]\n",time.tv_sec,time.tv_nsec/1000); |
#endif |
TIMESPEC_ASSIGN(&ld->deadline,&time); |
} else par_error(line_num); |
|
res = find_break(&pbuf,PAR_TIME, &time, &val); |
if (res == PAR_FOUND) { |
#ifdef PARSER_DEBUG |
cprintf("WCET: [%ld][%ld]\n",time.tv_sec,time.tv_nsec/1000); |
#endif |
TIMESPEC_ASSIGN(&ld->wcet,&time); |
310,7 → 318,7 |
} |
|
if (ld->exec_type != PAR_EXEC_CONST && ld->exec_type != PAR_EXEC_MEAN && |
ld->exec_type != PAR_EXEC_EXP) { |
ld->exec_type != PAR_EXEC_GAUSS) { |
res = find_break(&pbuf,PAR_TIME, &time, &val); |
if (res == PAR_FOUND) { |
#ifdef PARSER_DEBUG |