maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added the flag itti_dump_running to stop enqueuing messages when exiting the ITTI dump thread.

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4533 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
winckel
2013-11-26 17:02:01 +00:00
parent 2ee4242de0
commit c0ec13517c
1 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/itti/intertask_interface_dump.c
+36 -29
View File
@@ -134,6 +134,7 @@ typedef struct {
static itti_desc_t itti_dump_queue; static itti_desc_t itti_dump_queue;
static FILE *dump_file; static FILE *dump_file;
static int itti_dump_running = 1;
static int itti_dump_send_message(int sd, itti_dump_queue_item_t *message); static int itti_dump_send_message(int sd, itti_dump_queue_item_t *message);
static int itti_dump_handle_new_connection(int sd, const char *xml_definition, static int itti_dump_handle_new_connection(int sd, const char *xml_definition,
@@ -276,43 +277,46 @@ int itti_dump_queue_message(message_number_t message_number,
const char *message_name, const char *message_name,
const uint32_t message_size) const uint32_t message_size)
{ {
itti_dump_queue_item_t *new; if (itti_dump_running)
size_t message_name_length; {
int i; itti_dump_queue_item_t *new;
size_t message_name_length;
int i;
DevAssert(message_name != NULL); DevAssert(message_name != NULL);
DevAssert(message_p != NULL); DevAssert(message_p != NULL);
new = calloc(1, sizeof(itti_dump_queue_item_t)); new = calloc(1, sizeof(itti_dump_queue_item_t));
if (new == NULL) { if (new == NULL) {
ITTI_DUMP_ERROR("Failed to allocate memory (%s:%d)\n", ITTI_DUMP_ERROR("Failed to allocate memory (%s:%d)\n",
__FILE__, __LINE__); __FILE__, __LINE__);
return -1; return -1;
} }
new->data = malloc(message_size); new->data = malloc(message_size);
if (new->data == NULL) { if (new->data == NULL) {
ITTI_DUMP_ERROR("Failed to allocate memory (%s:%d)\n", ITTI_DUMP_ERROR("Failed to allocate memory (%s:%d)\n",
__FILE__, __LINE__); __FILE__, __LINE__);
return -1; return -1;
} }
memcpy(new->data, message_p, message_size); memcpy(new->data, message_p, message_size);
new->data_size = message_size; new->data_size = message_size;
new->message_number = message_number; new->message_number = message_number;
message_name_length = strlen(message_name) + 1; message_name_length = strlen(message_name) + 1;
DevCheck(message_name_length <= SIGNAL_NAME_LENGTH, message_name_length, DevCheck(message_name_length <= SIGNAL_NAME_LENGTH, message_name_length,
SIGNAL_NAME_LENGTH, 0); SIGNAL_NAME_LENGTH, 0);
memcpy(new->message_name, message_name, message_name_length); memcpy(new->message_name, message_name, message_name_length);
itti_dump_enqueue_message(new, message_size, ITTI_DUMP_MESSAGE_TYPE); itti_dump_enqueue_message(new, message_size, ITTI_DUMP_MESSAGE_TYPE);
for (i = 0; i < ITTI_DUMP_MAX_CON; i++) { for (i = 0; i < ITTI_DUMP_MAX_CON; i++) {
if (itti_dump_queue.itti_clients[i].sd == -1) if (itti_dump_queue.itti_clients[i].sd == -1)
continue; continue;
itti_dump_send_message(itti_dump_queue.itti_clients[i].sd, new); itti_dump_send_message(itti_dump_queue.itti_clients[i].sd, new);
}
} }
return 0; return 0;
@@ -699,6 +703,9 @@ void itti_dump_exit(void)
new = calloc(1, sizeof(itti_dump_queue_item_t)); new = calloc(1, sizeof(itti_dump_queue_item_t));
/* Set a flag to stop recording message */
itti_dump_running = 0;
/* Send the exit signal to other thread */ /* Send the exit signal to other thread */
itti_dump_enqueue_message(new, 0, ITTI_DUMP_EXIT_SIGNAL); itti_dump_enqueue_message(new, 0, ITTI_DUMP_EXIT_SIGNAL);