diff options
Diffstat (limited to 'src/analysis/storage/tpmem.c')
| -rw-r--r-- | src/analysis/storage/tpmem.c | 91 |
1 files changed, 29 insertions, 62 deletions
diff --git a/src/analysis/storage/tpmem.c b/src/analysis/storage/tpmem.c index 58585cd..cda8223 100644 --- a/src/analysis/storage/tpmem.c +++ b/src/analysis/storage/tpmem.c @@ -28,6 +28,7 @@ #include <stdint.h> +#include "../db/misc/rlestr.h" #include "../../arch/operands/target.h" #include "../../core/logs.h" @@ -219,9 +220,9 @@ GTypeMemory *g_type_memory_new(void) /****************************************************************************** * * * Paramètres : tpmem = mémoire à compléter. * -* fd = flux ouvert en lecture. * +* pbuf = zone tampon à lire. * * * -* Description : Apprend tous les types mémorisés dans un flux. * +* Description : Apprend tous les types mémorisés dans un tampon. * * * * Retour : Bilan de l'opération. * * * @@ -229,64 +230,45 @@ GTypeMemory *g_type_memory_new(void) * * ******************************************************************************/ -bool g_type_memory_read_types(GTypeMemory *tpmem, int fd) +bool g_type_memory_load_types(GTypeMemory *tpmem, packed_buffer_t *pbuf) { bool result; /* Bilan à enregistrer */ - packed_buffer_t pbuf; /* Tampon des données à écrire */ - uint64_t i; /* Boucle de parcours */ - unsigned char len; /* Taille d'un nom de type */ - char *name; /* Désignation d'un type */ - - init_packed_buffer(&pbuf); + uleb128_t count; /* Nombre d'éléments détectés */ + uleb128_t i; /* Boucle de parcours */ + rle_string str; /* Chaîne à charger */ - result = read_packed_buffer(&pbuf, fd); + result = unpack_uleb128(&count, pbuf); if (result) { g_mutex_lock(&tpmem->mutex); - result = extract_packed_buffer(&pbuf, &tpmem->count, sizeof(uint64_t), true); + tpmem->count = count; - if (result) - { - assert(tpmem->gtypes == NULL); - tpmem->gtypes = calloc(tpmem->count, sizeof(gtype_ref_info_t)); - } + assert(tpmem->gtypes == NULL); + tpmem->gtypes = calloc(count, sizeof(gtype_ref_info_t)); for (i = 0; i < tpmem->count && result; i++) { - result = extract_packed_buffer(&pbuf, &len, sizeof(unsigned char), false); - - if (result) - { - name = malloc(len); + result = unpack_rle_string(&str, pbuf); + if (!result) break; - result = extract_packed_buffer(&pbuf, name, len, false); + tpmem->gtypes[i].gtype = g_type_from_name(get_rle_string(&str)); + result = (tpmem->gtypes[i].gtype != 0); - if (result) - { - tpmem->gtypes[i].gtype = g_type_from_name(name); - result = (tpmem->gtypes[i].gtype != 0); + if (!result) + log_variadic_message(LMT_ERROR, "Unknown type: '%s'", get_rle_string(&str)); - if (!result) - log_variadic_message(LMT_ERROR, "Unknown type: '%s'", name); + else + tpmem->gtypes[i].gclass = g_type_class_ref(tpmem->gtypes[i].gtype); - } - - if (result) - tpmem->gtypes[i].gclass = g_type_class_ref(tpmem->gtypes[i].gtype); - - free(name); - - } + exit_rle_string(&str); } - g_mutex_unlock(&tpmem->mutex); - } - exit_packed_buffer(&pbuf); + g_mutex_unlock(&tpmem->mutex); return result; @@ -399,9 +381,9 @@ bool g_type_memory_store_object_gtype(GTypeMemory *tpmem, GObject *obj, packed_b /****************************************************************************** * * * Paramètres : tpmem = mémoire à consulter. * -* fd = flux ouvert en écriture. * +* pbuf = zone tampon à remplir. * * * -* Description : Enregistre tous les types mémorisés dans un flux. * +* Description : Enregistre tous les types mémorisés dans un tampon. * * * * Retour : Bilan de l'opération. * * * @@ -409,46 +391,31 @@ bool g_type_memory_store_object_gtype(GTypeMemory *tpmem, GObject *obj, packed_b * * ******************************************************************************/ -bool g_type_memory_write_types(GTypeMemory *tpmem, int fd) +bool g_type_memory_store_types(GTypeMemory *tpmem, packed_buffer_t *pbuf) { bool result; /* Bilan à enregistrer */ - packed_buffer_t pbuf; /* Tampon des données à écrire */ uint64_t i; /* Boucle de parcours */ const gchar *name; /* Désignation d'un type */ - size_t len; /* Taille de ce nom */ - - init_packed_buffer(&pbuf); + rle_string str; /* Chaîne à conserver */ g_mutex_lock(&tpmem->mutex); - result = extend_packed_buffer(&pbuf, &tpmem->count, sizeof(uint64_t), true); + result = pack_uleb128((uleb128_t []){ tpmem->count }, pbuf); for (i = 0; i < tpmem->count && result; i++) { name = g_type_name(tpmem->gtypes[i].gtype); - len = strlen(name) + 1; - if (len > (2 << (sizeof(unsigned char) * 8 - 1))) - { - log_variadic_message(LMT_ERROR, "Type name too long: '%s' (%zu bytes)", name, len); - result = false; - break; - } + init_static_rle_string(&str, name); - result = extend_packed_buffer(&pbuf, (unsigned char []) { len }, sizeof(unsigned char), false); + result = pack_rle_string(&str, pbuf); - if (result) - result = extend_packed_buffer(&pbuf, name, len, false); + exit_rle_string(&str); } - if (result) - result = write_packed_buffer(&pbuf, fd); - g_mutex_unlock(&tpmem->mutex); - exit_packed_buffer(&pbuf); - return result; } |