From bf7f722d0f42b37a83df91d0a62544c948c4cb66 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 20:24:11 +0800
Subject: [PATCH] Extend travis script to test all configurations with device dependent error
---
libscpi/src/parser.c | 185 +++++++++++++++++++++++++---------------------
1 files changed, 100 insertions(+), 85 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index ca0aa93..af37b01 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -219,10 +219,11 @@
result &= processCommand(context);
cmd_prev = state->programHeader;
} else {
- //SCPI_ErrorPush(context, SCPI_ERROR_UNDEFINED_HEADER);
- /* test */
- data[r-1]=0;
- SCPI_ErrorPushEx(context, SCPI_ERROR_UNDEFINED_HEADER, data);
+ /* place undefined header with error */
+ /* calculate length of errornouse header and trim \r\n */
+ size_t r2 = r;
+ while(r2 > 0 && (data[r2 - 1] == '\r' || data[r2 - 1] == '\n')) r2--;
+ SCPI_ErrorPushEx(context, SCPI_ERROR_UNDEFINED_HEADER, data, r2);
result = FALSE;
}
}
@@ -245,19 +246,26 @@
/**
* Initialize SCPI context structure
* @param context
- * @param command_list
- * @param buffer
+ * @param commands
* @param interface
+ * @param units
+ * @param idn1
+ * @param idn2
+ * @param idn3
+ * @param idn4
+ * @param input_buffer
+ * @param input_buffer_length
+ * @param error_queue_data
+ * @param error_queue_size
*/
-void SCPI_Init(scpi_t * context,
+void SCPI_Init(scpi_t * context,
const scpi_command_t * commands,
scpi_interface_t * interface,
const scpi_unit_def_t * units,
const char * idn1, const char * idn2, const char * idn3, const char * idn4,
- char * input_buffer, size_t input_buffer_length,
- scpi_error_t * error_queue_data, int16_t error_queue_size,
- char * error_info_heap, size_t error_info_heap_length) {
- memset(context, 0, sizeof(*context));
+ char * input_buffer, size_t input_buffer_length,
+ scpi_error_t * error_queue_data, int16_t error_queue_size) {
+ memset(context, 0, sizeof (*context));
context->cmdlist = commands;
context->interface = interface;
context->units = units;
@@ -268,11 +276,22 @@
context->buffer.data = input_buffer;
context->buffer.length = input_buffer_length;
context->buffer.position = 0;
- context->error_info_heap.data = error_info_heap;
- context->error_info_heap.position = 0;
- context->error_info_heap.length = error_info_heap_length;
SCPI_ErrorInit(context, error_queue_data, error_queue_size);
}
+
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION && !USE_MEMORY_ALLOCATION_FREE
+/**
+ * Initialize context's
+ * @param context
+ * @param data
+ * @param len
+ * @return
+ */
+void SCPI_InitHeap(scpi_t * context,
+ char * error_info_heap, size_t error_info_heap_length) {
+ scpiheap_init(&context->error_info_heap, error_info_heap, error_info_heap_length);
+}
+#endif
/**
* Interface to the application. Adds data to system buffer and try to search
@@ -507,83 +526,79 @@
return result;
}
-#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
- #if USE_MEMORY_ALLOCATION_FREE
- #define MAX_BUFF_SIZE 2
- #else
- #define MAX_BUFF_SIZE 3
- #endif
-#else
- #define MAX_BUFF_SIZE 1
-#endif
-
-static size_t startoutputlimit = 0;
-
+/**
+ * SCPI-99:21.8 Device-dependent error information.
+ * Write error information with the following syntax:
+ * <Error/event_number>,"<Error/event_description>[;<Device-dependent_info>]"
+ * The maximum string length of <Error/event_description> plus <Device-dependent_info>
+ * is SCPI_STD_ERROR_DESC_MAX_STRING_LENGTH (255) characters.
+ *
+ * @param context
+ * @param error
+ * @return
+ */
size_t SCPI_ResultError(scpi_t * context, scpi_error_t * error) {
- size_t result = 0;
- size_t outputlimit = startoutputlimit++;
- size_t step = 0;
- const char * quote;
+ size_t result = 0;
+ size_t outputlimit = SCPI_STD_ERROR_DESC_MAX_STRING_LENGTH;
+ size_t step = 0;
+ const char * quote;
- char * data[MAX_BUFF_SIZE];
- size_t len[MAX_BUFF_SIZE];
-
- data[0] = SCPI_ErrorTranslate(error->error_code);
- len[0] = strlen(data[0]);
+ const char * data[SCPIDEFINE_DESCRIPTION_MAX_PARTS];
+ size_t len[SCPIDEFINE_DESCRIPTION_MAX_PARTS];
+ size_t i;
+
+ data[0] = SCPI_ErrorTranslate(error->error_code);
+ len[0] = strlen(data[0]);
+
#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
- #if USE_MEMORY_ALLOCATION_FREE
- data[1] = error->device_dependent_info;
- len[1] = error->device_dependent_info ? strlen(data[1]) : 0;
- #else
- data[1] = SCPIDEFINE_get_1st_part(error->device_dependent_info,&len[1]);
- data[2] = SCPIDEFINE_get_1st_part(data[1],&len[2]);
- #endif
+ data[1] = error->device_dependent_info;
+#if USE_MEMORY_ALLOCATION_FREE
+ len[1] = error->device_dependent_info ? strlen(data[1]) : 0;
+#else
+ SCPIDEFINE_get_parts(&context->error_info_heap, data[1], &len[1], &data[2], &len[2]);
+#endif
#endif
- result += SCPI_ResultInt32(context, error->error_code);
- result += writeDelimiter(context);
- result += writeData(context, "\"", 1);
-
- for(size_t i = 0; data[i] && outputlimit && (i < MAX_BUFF_SIZE); i++){
- if(i==1){
- result += writeSemicolon(context);
- outputlimit -= 1;
- }
- if(len[i] > outputlimit) {
- len[i] = outputlimit;
- }
-
- while ((quote = strnpbrk(data[i], len[i], "\""))) {
- if((step = quote - data[i] + 1) >= outputlimit){
- len[i] -= 1;
- outputlimit -= 1;
- break;
- }
- result += writeData(context, data[i], step);
- result += writeData(context, "\"", 1);
- len[i] -= step ;
- outputlimit -= step + 1;
- data[i] = quote + 1;
- if(len[i] > outputlimit) {
- len[i] = outputlimit;
- }
- }
-
- result += writeData(context, data[i], len[i]);
- outputlimit-=len[i];
- }
- result += writeData(context, "\"", 1);
-
- #if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
- #if USE_MEMORY_ALLOCATION_FREE
- SCPIDEFINE_free(error->device_dependent_info);
- #else
- #endif
- #endif
-
- return result;
+ result += SCPI_ResultInt32(context, error->error_code);
+ result += writeDelimiter(context);
+ result += writeData(context, "\"", 1);
+
+ for (i = 0; (i < SCPIDEFINE_DESCRIPTION_MAX_PARTS) && data[i] && outputlimit; i++) {
+ if (i == 1) {
+ result += writeSemicolon(context);
+ outputlimit -= 1;
+ }
+ if (len[i] > outputlimit) {
+ len[i] = outputlimit;
+ }
+
+ while ((quote = strnpbrk(data[i], len[i], "\""))) {
+ if ((step = quote - data[i] + 1) >= outputlimit) {
+ len[i] -= 1;
+ outputlimit -= 1;
+ break;
+ }
+ result += writeData(context, data[i], step);
+ result += writeData(context, "\"", 1);
+ len[i] -= step;
+ outputlimit -= step + 1;
+ data[i] = quote + 1;
+ if (len[i] > outputlimit) {
+ len[i] = outputlimit;
+ }
+ }
+
+ result += writeData(context, data[i], len[i]);
+ outputlimit -= len[i];
+ }
+ result += writeData(context, "\"", 1);
+
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ SCPIDEFINE_free(&context->error_info_heap, error->device_dependent_info, false);
+#endif
+
+ return result;
}
-#undef MAX_BUFF_SIZE
/**
* Write arbitrary block header with length
--
Gitblit v1.9.1