luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[INTERPRETER]

Browse source 
* OPT: Association between file descriptors and callbacks use a direct 
  index now.


git-svn-id: svn://localhost/gambas/trunk@3132 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2010-08-25 11:23:19 +00:00
parent 85b08d28ba
commit 19a21789e6
1 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
main/gbx/gbx_watch.c
View file

@ -43,6 +43,8 @@ static fd_set read_fd;
static fd_set write_fd;
static WATCH_CALLBACK *watch_callback = NULL;
static short *watch_index = NULL;
static int max_fd = 0;
static WATCH_TIMER *_timers = NULL;
@ -245,6 +247,7 @@ void WATCH_init(void)
FD_ZERO(&write_fd);
ARRAY_create(&watch_callback);
ARRAY_create(&watch_index);
ARRAY_create(&_timers);
#ifdef DEBUG_TIMER
@ -256,6 +259,7 @@ void WATCH_init(void)
void WATCH_exit(void)
{
ARRAY_delete(&watch_callback);
ARRAY_delete(&watch_index);
ARRAY_delete(&_timers);
}
@ -285,7 +289,13 @@ static void watch_fd(int fd, int flag, bool watch)
static int watch_find_callback(int fd)
{
int i;
fprintf(stderr, "watch_find_callback: %d\n", fd);
if (fd < 0 || fd >= ARRAY_count(watch_index))
return -1;
else
return watch_index[fd];
/*int i;
for (i = 0; i < ARRAY_count(watch_callback); i++)
{
@ -293,7 +303,7 @@ static int watch_find_callback(int fd)
return i;
}
return (-1);
return (-1);*/
}
@ -311,6 +321,20 @@ static int find_max_fd(void)
return max;
}
static void ensure_watch_index(int fd)
{
int i;
int count = ARRAY_count(watch_index);
//fprintf(stderr, "ensure_watch_index: %d (%d)\n", fd, count);
if (fd < count)
return;
ARRAY_add_many(&watch_index, fd - count + 1);
for (i = count; i <= fd; i++)
watch_index[i] = -1;
}
static WATCH_CALLBACK *watch_create_callback(int fd)
{
@ -324,6 +348,7 @@ static WATCH_CALLBACK *watch_create_callback(int fd)
pos = watch_find_callback(fd);
if (pos < 0)
{
pos = ARRAY_count(watch_callback);
wcb = ARRAY_add_void(&watch_callback);
wcb->fd = fd;
}
@ -337,6 +362,9 @@ static WATCH_CALLBACK *watch_create_callback(int fd)
fprintf(stderr, "watch_create_callback: %d -> %d read = %p (%p) write = %p (%p)\n", fd, pos, wcb->callback_read, (void *)wcb->param_read, wcb->callback_write, (void *)wcb->param_write);
#endif
ensure_watch_index(fd);
watch_index[fd] = pos;
return wcb;
}
@ -354,6 +382,8 @@ static void watch_delete_callback(int fd)
if (pos < 0)
return;
watch_index[fd] = -1;
wcb = &watch_callback[pos];
wcb->fd = -1;
watch_fd(fd, WATCH_READ, FALSE);