diff options
Diffstat (limited to 'src/glibext')
| -rw-r--r-- | src/glibext/delayed.c | 99 | ||||
| -rw-r--r-- | src/glibext/delayed.h | 3 |
2 files changed, 74 insertions, 28 deletions
diff --git a/src/glibext/delayed.c b/src/glibext/delayed.c index e93edc2..caffbaa 100644 --- a/src/glibext/delayed.c +++ b/src/glibext/delayed.c @@ -25,6 +25,7 @@ #include <assert.h> +#include <inttypes.h> #include <malloc.h> #include <stdio.h> #include <string.h> @@ -112,7 +113,7 @@ static void g_work_group_dispose(GWorkGroup *); static void g_work_group_finalize(GWorkGroup *); /* Crée un nouveau thread dédié à un type de travaux donné. */ -static GWorkGroup *g_work_group_new(wgroup_id_t); +static GWorkGroup *g_work_group_new(wgroup_id_t, const guint *); /* Fournit l'identifiant associé à un groupe de travail. */ static wgroup_id_t g_work_group_get_id(const GWorkGroup *); @@ -175,7 +176,7 @@ static void g_work_queue_dispose(GWorkQueue *); static void g_work_queue_finalize(GWorkQueue *); /* Donne l'assurance de l'existence d'un groupe de travail. */ -static bool g_work_queue_ensure_group_exists(GWorkQueue *, wgroup_id_t); +static bool g_work_queue_ensure_group_exists(GWorkQueue *, wgroup_id_t, const guint *); /* Fournit le groupe de travail correspondant à un identifiant. */ static GWorkGroup *g_work_queue_find_group_for_id(GWorkQueue *, wgroup_id_t); @@ -386,8 +387,7 @@ static void g_work_group_class_init(GWorkGroupClass *klass) static void g_work_group_init(GWorkGroup *group) { - guint i; /* Boucle de parcours */ - char name[16]; /* Désignation humaine */ + group->works = NULL; g_mutex_init(&group->mutex); g_cond_init(&group->cond); @@ -395,26 +395,8 @@ static void g_work_group_init(GWorkGroup *group) g_atomic_int_set(&group->pending, 0); + group->threads = NULL; group->threads_count = g_get_num_processors(); - - group->threads = (GThread **)calloc(group->threads_count, sizeof(GThread *)); - - for (i = 0; i < group->threads_count; i++) - { - snprintf(name, sizeof(name), "work_group_%u", i); - - group->threads[i] = g_thread_new(name, (GThreadFunc)g_work_group_process, group); - if (!group->threads[i]) - goto gwgi_error; - - } - - gwgi_error: - - group->threads_count = i; - - assert(i > 0); - group->force_exit = false; group->callback = NULL; @@ -498,7 +480,8 @@ static void g_work_group_finalize(GWorkGroup *group) /****************************************************************************** * * -* Paramètres : id = identifiant accordé au nouveau groupe. * +* Paramètres : id = identifiant accordé au nouveau groupe. * +* count = quantité de threads à allouer. * * * * Description : Crée un nouveau thread dédié à un type de travaux donné. * * * @@ -508,14 +491,39 @@ static void g_work_group_finalize(GWorkGroup *group) * * ******************************************************************************/ -static GWorkGroup *g_work_group_new(wgroup_id_t id) +static GWorkGroup *g_work_group_new(wgroup_id_t id, const guint *count) { GWorkGroup *result; /* Traiteur à retourner */ + guint i; /* Boucle de parcours */ + char name[16]; /* Désignation humaine */ result = g_object_new(G_TYPE_WORK_GROUP, NULL); result->id = id; + result->threads_count = g_get_num_processors(); + + if (count != NULL && *count < result->threads_count) + result->threads_count = *count; + + result->threads = (GThread **)calloc(result->threads_count, sizeof(GThread *)); + + for (i = 0; i < result->threads_count; i++) + { + snprintf(name, sizeof(name), "wgrp_%" PRIu64 "-%u", id, i); + + result->threads[i] = g_thread_new(name, (GThreadFunc)g_work_group_process, result); + if (!result->threads[i]) + goto start_error; + + } + + start_error: + + result->threads_count = i; + + assert(i > 0); + return result; } @@ -931,6 +939,7 @@ GWorkQueue *g_work_queue_new(void) * * * Paramètres : queue = gestionnaire de l'ensemble des groupes de travail. * * id = identifiant d'un groupe de travail. * +* count = quantité de threads à allouer. * * * * Description : Donne l'assurance de l'existence d'un groupe de travail. * * * @@ -940,7 +949,7 @@ GWorkQueue *g_work_queue_new(void) * * ******************************************************************************/ -static bool g_work_queue_ensure_group_exists(GWorkQueue *queue, wgroup_id_t id) +static bool g_work_queue_ensure_group_exists(GWorkQueue *queue, wgroup_id_t id, const guint *count) { bool found; /* Bilan des recherches */ size_t i; /* Boucle de parcours */ @@ -962,7 +971,7 @@ static bool g_work_queue_ensure_group_exists(GWorkQueue *queue, wgroup_id_t id) queue->groups = (GWorkGroup **)realloc(queue->groups, queue->groups_count * sizeof(GWorkGroup *)); - group = g_work_group_new(id); + group = g_work_group_new(id, count); queue->groups[queue->groups_count - 1] = group; } @@ -994,7 +1003,41 @@ wgroup_id_t g_work_queue_define_work_group(GWorkQueue *queue) do { result = queue->generator++; - created = g_work_queue_ensure_group_exists(queue, result); + created = g_work_queue_ensure_group_exists(queue, result, NULL); + } + while (!created); + + g_mutex_unlock(&queue->mutex); + + return result; + +} + + +/****************************************************************************** +* * +* Paramètres : queue = gestionnaire de l'ensemble des groupes de travail. * +* count = quantité de threads à allouer. * +* * +* Description : Constitue un nouveau petit groupe de travail. * +* * +* Retour : Nouvel identifiant unique d'un nouveau groupe de travail. * +* * +* Remarques : - * +* * +******************************************************************************/ + +wgroup_id_t g_work_queue_define_tiny_work_group(GWorkQueue *queue, guint count) +{ + wgroup_id_t result; /* Valeur à retourner */ + bool created; /* Bilan d'une tentative */ + + g_mutex_lock(&queue->mutex); + + do + { + result = queue->generator++; + created = g_work_queue_ensure_group_exists(queue, result, &count); } while (!created); diff --git a/src/glibext/delayed.h b/src/glibext/delayed.h index 4669d2d..0fb03bd 100644 --- a/src/glibext/delayed.h +++ b/src/glibext/delayed.h @@ -98,6 +98,9 @@ GWorkQueue *g_work_queue_new(void); /* Constitue un nouveau groupe de travail. */ wgroup_id_t g_work_queue_define_work_group(GWorkQueue *); +/* Constitue un nouveau petit groupe de travail. */ +wgroup_id_t g_work_queue_define_tiny_work_group(GWorkQueue *, guint); + /* Dissout un groupe de travail existant. */ void g_work_queue_delete_work_group(GWorkQueue *, wgroup_id_t); |