andy/mpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small optimisation

Browse Source
This commit is contained in:
Daniel Holden
2015-11-09 15:02:38 +00:00
parent 613fc26729
commit 991a6e4156
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mpc.c
View File

@@ -324,6 +324,7 @@ typedef struct {
FILE *file; FILE *file;
int backtrack; int backtrack;
int marks_slots;
int marks_num; int marks_num;
mpc_state_t* marks; mpc_state_t* marks;
char* lasts; char* lasts;
@@ -332,6 +333,10 @@ typedef struct {
} mpc_input_t; } mpc_input_t;
enum {
MPC_INPUT_MARKS_MIN = 32
};
static mpc_input_t *mpc_input_new_string(const char *filename, const char *string) { static mpc_input_t *mpc_input_new_string(const char *filename, const char *string) {
mpc_input_t *i = malloc(sizeof(mpc_input_t)); mpc_input_t *i = malloc(sizeof(mpc_input_t));
@@ -349,8 +354,9 @@ static mpc_input_t *mpc_input_new_string(const char *filename, const char *strin
i->backtrack = 1; i->backtrack = 1;
i->marks_num = 0; i->marks_num = 0;
i->marks = NULL; i->marks_slots = MPC_INPUT_MARKS_MIN;
i->lasts = NULL; i->marks = malloc(sizeof(mpc_state_t) * i->marks_slots);
i->lasts = malloc(sizeof(char) * i->marks_slots);
i->last = '\0'; i->last = '\0';
@@ -373,8 +379,9 @@ static mpc_input_t *mpc_input_new_pipe(const char *filename, FILE *pipe) {
i->backtrack = 1; i->backtrack = 1;
i->marks_num = 0; i->marks_num = 0;
i->marks = NULL; i->marks_slots = MPC_INPUT_MARKS_MIN;
i->lasts = NULL; i->marks = malloc(sizeof(mpc_state_t) * i->marks_slots);
i->lasts = malloc(sizeof(char) * i->marks_slots);
i->last = '\0'; i->last = '\0';
@@ -397,8 +404,9 @@ static mpc_input_t *mpc_input_new_file(const char *filename, FILE *file) {
i->backtrack = 1; i->backtrack = 1;
i->marks_num = 0; i->marks_num = 0;
i->marks = NULL; i->marks_slots = MPC_INPUT_MARKS_MIN;
i->lasts = NULL; i->marks = malloc(sizeof(mpc_state_t) * i->marks_slots);
i->lasts = malloc(sizeof(char) * i->marks_slots);
i->last = '\0'; i->last = '\0';
@@ -425,8 +433,13 @@ static void mpc_input_mark(mpc_input_t *i) {
if (i->backtrack < 1) { return; } if (i->backtrack < 1) { return; }
i->marks_num++; i->marks_num++;
i->marks = realloc(i->marks, sizeof(mpc_state_t) * i->marks_num);
i->lasts = realloc(i->lasts, sizeof(char) * i->marks_num); if (i->marks_num > i->marks_slots) {
i->marks_slots = i->marks_num + i->marks_num / 2;
i->marks = realloc(i->marks, sizeof(mpc_state_t) * i->marks_slots);
i->lasts = realloc(i->lasts, sizeof(char) * i->marks_slots);
}
i->marks[i->marks_num-1] = i->state; i->marks[i->marks_num-1] = i->state;
i->lasts[i->marks_num-1] = i->last; i->lasts[i->marks_num-1] = i->last;
@@ -441,8 +454,15 @@ static void mpc_input_unmark(mpc_input_t *i) {
if (i->backtrack < 1) { return; } if (i->backtrack < 1) { return; }
i->marks_num--; i->marks_num--;
i->marks = realloc(i->marks, sizeof(mpc_state_t) * i->marks_num);
i->lasts = realloc(i->lasts, sizeof(char) * i->marks_num); if (i->marks_slots > i->marks_num + i->marks_num / 2
&& i->marks_slots > MPC_INPUT_MARKS_MIN) {
i->marks_slots =
i->marks_num > MPC_INPUT_MARKS_MIN ?
i->marks_num : MPC_INPUT_MARKS_MIN;
i->marks = realloc(i->marks, sizeof(mpc_state_t) * i->marks_slots);
i->lasts = realloc(i->lasts, sizeof(char) * i->marks_slots);
}
if (i->type == MPC_INPUT_PIPE && i->marks_num == 0) { if (i->type == MPC_INPUT_PIPE && i->marks_num == 0) {
free(i->buffer); free(i->buffer);