From 3344d1a728d37f0fb3e82a6a945eee0c780eb734 Mon Sep 17 00:00:00 2001
From: Chernov Dmitriy <cd_work@mail.ru>
Date: 周三, 02 3月 2016 21:29:32 +0800
Subject: [PATCH] Fix potential memory leak. #73
---
libscpi/src/error.c | 161 +++++++++++++++++++++++++++++++----------------------
1 files changed, 94 insertions(+), 67 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index d856db3..d1307a4 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -41,23 +41,39 @@
#include "scpi/error.h"
#include "fifo_private.h"
-/* basic FIFO */
-static scpi_fifo_t local_error_queue;
-
-
/**
* Initialize error queue
* @param context - scpi context
*/
-void SCPI_ErrorInit(scpi_t * context) {
- /*
- * // FreeRTOS
- * context->error_queue = (scpi_error_queue_t)xQueueCreate(100, sizeof(int16_t));
- */
+void SCPI_ErrorInit(scpi_t * context, scpi_error_t * data, int16_t size) {
+ fifo_init(&context->error_queue, data, size);
+}
- /* basic FIFO */
- context->error_queue = (scpi_error_queue_t)&local_error_queue;
- fifo_init((scpi_fifo_t *)context->error_queue);
+/**
+ * Emit no error
+ * @param context scpi context
+ */
+static void SCPI_ErrorEmitEmpty(scpi_t * context) {
+ if ((SCPI_ErrorCount(context) == 0) && (SCPI_RegGet(context, SCPI_REG_STB) & STB_QMA)) {
+ SCPI_RegClearBits(context, SCPI_REG_STB, STB_QMA);
+
+ if (context->interface && context->interface->error) {
+ context->interface->error(context, 0);
+ }
+ }
+}
+
+/**
+ * Emit error
+ * @param context scpi context
+ * @param err Error to emit
+ */
+static void SCPI_ErrorEmit(scpi_t * context, int16_t err) {
+ SCPI_RegSetBits(context, SCPI_REG_STB, STB_QMA);
+
+ if (context->interface && context->interface->error) {
+ context->interface->error(context, err);
+ }
}
/**
@@ -65,34 +81,32 @@
* @param context - scpi context
*/
void SCPI_ErrorClear(scpi_t * context) {
- /*
- * // FreeRTOS
- * xQueueReset((xQueueHandle)context->error_queue);
- */
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ scpi_error_t error;
+ while(fifo_remove(&context->error_queue, &error)){
+ SCPIDEFINE_free(&context->error_info_heap, error.device_dependent_info, false);
+ }
+#endif
+ fifo_clear(&context->error_queue);
- /* basic FIFO */
- fifo_clear((scpi_fifo_t *)context->error_queue);
+ SCPI_ErrorEmitEmpty(context);
}
/**
* Pop error from queue
* @param context - scpi context
- * @return error number
+ * @param error
+ * @return
*/
-int16_t SCPI_ErrorPop(scpi_t * context) {
- int16_t result = 0;
+scpi_bool_t SCPI_ErrorPop(scpi_t * context, scpi_error_t * error) {
+ if(!error || !context) return FALSE;
+ error->error_code = 0;
+ error->device_dependent_info = NULL;
+ fifo_remove(&context->error_queue, error);
- /*
- * // FreeRTOS
- * if (pdFALSE == xQueueReceive((xQueueHandle)context->error_queue, &result, 0)) {
- * result = 0;
- * }
- */
+ SCPI_ErrorEmitEmpty(context);
- /* basic FIFO */
- fifo_remove((scpi_fifo_t *)context->error_queue, &result);
-
- return result;
+ return TRUE;
}
/**
@@ -103,25 +117,18 @@
int32_t SCPI_ErrorCount(scpi_t * context) {
int16_t result = 0;
- /*
- * // FreeRTOS
- * result = uxQueueMessagesWaiting((xQueueHandle)context->error_queue);
- */
-
- /* basic FIFO */
- fifo_count((scpi_fifo_t *)context->error_queue, &result);
+ fifo_count(&context->error_queue, &result);
return result;
}
-static void SCPI_ErrorAddInternal(scpi_t * context, int16_t err) {
- /*
- * // FreeRTOS
- * xQueueSend((xQueueHandle)context->error_queue, &err, 0);
- */
-
- /* basic FIFO */
- fifo_add((scpi_fifo_t *)context->error_queue, err);
+static scpi_bool_t SCPI_ErrorAddInternal(scpi_t * context, int16_t err, char * info) {
+ if (!fifo_add(&context->error_queue, err, info)) {
+ fifo_remove_last(&context->error_queue, NULL);
+ fifo_add(&context->error_queue, SCPI_ERROR_QUEUE_OVERFLOW, NULL);
+ return FALSE;
+ }
+ return TRUE;
}
struct error_reg {
@@ -136,7 +143,7 @@
{-100, -199, ESR_CER}, /* Command error (e.g. syntax error) ch 21.8.9 */
{-200, -299, ESR_EER}, /* Execution Error (e.g. range error) ch 21.8.10 */
{-300, -399, ESR_DER}, /* Device specific error -300, -399 ch 21.8.11 */
- { 1,32767, ESR_DER}, /* Device designer provided specific error 1, 32767 ch 21.8.11 */
+ { 1, 32767, ESR_DER}, /* Device designer provided specific error 1, 32767 ch 21.8.11 */
{-400, -499, ESR_QER}, /* Query error -400, -499 ch 21.8.12 */
{-500, -599, ESR_PON}, /* Power on event -500, -599 ch 21.8.13 */
{-600, -699, ESR_URQ}, /* User Request Event -600, -699 ch 21.8.14 */
@@ -149,25 +156,45 @@
* @param context - scpi context
* @param err - error number
*/
+void SCPI_ErrorPushEx(scpi_t * context, int16_t err, char * info) {
+ int i;
+ char * info_ptr = NULL;
+
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ if (info){
+ info_ptr = SCPIDEFINE_strdup(&context->error_info_heap, info);
+ }
+#endif
+
+ scpi_bool_t queue_overflow = !SCPI_ErrorAddInternal(context, err, info_ptr);
+
+ for (i = 0; i < ERROR_DEFS_N; i++) {
+ if ((err <= errs[i].from) && (err >= errs[i].to)) {
+ SCPI_RegSetBits(context, SCPI_REG_ESR, errs[i].bit);
+ }
+ }
+
+ SCPI_ErrorEmit(context, err);
+ if (queue_overflow) {
+ SCPI_ErrorEmit(context, SCPI_ERROR_QUEUE_OVERFLOW);
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ SCPIDEFINE_free(&context->error_info_heap, info_ptr, true);
+#endif
+ }
+
+ if (context) {
+ context->cmd_error = TRUE;
+ }
+}
+
+/**
+ * Push error to queue
+ * @param context - scpi context
+ * @param err - error number
+ */
void SCPI_ErrorPush(scpi_t * context, int16_t err) {
-
- int i;
-
- SCPI_ErrorAddInternal(context, err);
-
- for(i = 0; i < ERROR_DEFS_N; i++) {
- if ((err <= errs[i].from) && (err >= errs[i].to)) {
- SCPI_RegSetBits(context, SCPI_REG_ESR, errs[i].bit);
- }
- }
-
- if (context) {
- if (context->interface && context->interface->error) {
- context->interface->error(context, err);
- }
-
- context->cmd_error = TRUE;
- }
+ SCPI_ErrorPushEx(context, err, NULL);
+ return;
}
/**
@@ -184,10 +211,10 @@
#else
#define XE(def, val, str)
#endif
-LIST_OF_ERRORS
+ LIST_OF_ERRORS
#if USE_USER_ERROR_LIST
-LIST_OF_USER_ERRORS
+ LIST_OF_USER_ERRORS
#endif
#undef X
#undef XE
--
Gitblit v1.9.1