X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=strutil.c;h=1acbf3de98236345d9bd0a9ad27e45e1bf7d75ed;hp=380d78f59efdbb0bf72009c903484a85d9f87a06;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=4d436e71ba6059b217a3d90775033e850944ad42 diff --git a/strutil.c b/strutil.c index 380d78f5..1acbf3de 100644 --- a/strutil.c +++ b/strutil.c @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2010 Uwe Hermann * @@ -21,43 +21,255 @@ #include #include #include -#include -#include +#include +#include "libsigrok.h" +#include "libsigrok-internal.h" + +#define LOG_PREFIX "strutil" /** - * Convert a numeric samplerate value to its "natural" string representation. + * @file + * + * Helper functions for handling or converting libsigrok-related strings. + */ + +/** + * @defgroup grp_strutil String utilities * - * E.g. a value of 3000000 would be converted to "3 MHz", 20000 to "20 kHz". + * Helper functions for handling or converting libsigrok-related strings. * - * @param samplerate The samplerate in Hz. - * @return A malloc()ed string representation of the samplerate value, - * or NULL upon errors. The caller is responsible to free() the memory. + * @{ + */ + +/** + * @private + * + * Convert a string representation of a numeric value to a long integer. The + * conversion is strict and will fail if the complete string does not represent + * a valid long integer. The function sets errno according to the details of the + * failure. + * + * @param str The string representation to convert. + * @param ret Pointer to long where the result of the conversion will be stored. + * + * @return SR_OK if conversion is successful, otherwise SR_ERR. + * + * @since 0.3.0 */ -char *sr_samplerate_string(uint64_t samplerate) +SR_PRIV int sr_atol(const char *str, long *ret) { - char *o; - int r; + long tmp; + char *endptr = NULL; - o = malloc(30 + 1); /* Enough for a uint64_t as string + " GHz". */ - if (!o) - return NULL; + errno = 0; + tmp = strtol(str, &endptr, 0); - if (samplerate >= SR_GHZ(1)) - r = snprintf(o, 30, "%" PRIu64 " GHz", samplerate / 1000000000); - else if (samplerate >= SR_MHZ(1)) - r = snprintf(o, 30, "%" PRIu64 " MHz", samplerate / 1000000); - else if (samplerate >= SR_KHZ(1)) - r = snprintf(o, 30, "%" PRIu64 " kHz", samplerate / 1000); - else - r = snprintf(o, 30, "%" PRIu64 " Hz", samplerate); + if (!endptr || *endptr || errno) { + if (!errno) + errno = EINVAL; + return SR_ERR; + } - if (r < 0) { - /* Something went wrong... */ - free(o); - return NULL; + *ret = tmp; + return SR_OK; +} + +/** + * @private + * + * Convert a string representation of a numeric value to an integer. The + * conversion is strict and will fail if the complete string does not represent + * a valid integer. The function sets errno according to the details of the + * failure. + * + * @param str The string representation to convert. + * @param ret Pointer to int where the result of the conversion will be stored. + * + * @return SR_OK if conversion is successful, otherwise SR_ERR. + * + * @since 0.3.0 + */ +SR_PRIV int sr_atoi(const char *str, int *ret) +{ + long tmp; + + if (sr_atol(str, &tmp) != SR_OK) + return SR_ERR; + + if ((int) tmp != tmp) { + errno = ERANGE; + return SR_ERR; } - return o; + *ret = (int) tmp; + return SR_OK; +} + +/** + * @private + * + * Convert a string representation of a numeric value to a double. The + * conversion is strict and will fail if the complete string does not represent + * a valid double. The function sets errno according to the details of the + * failure. + * + * @param str The string representation to convert. + * @param ret Pointer to double where the result of the conversion will be stored. + * + * @return SR_OK if conversion is successful, otherwise SR_ERR. + * + * @since 0.3.0 + */ +SR_PRIV int sr_atod(const char *str, double *ret) +{ + double tmp; + char *endptr = NULL; + + errno = 0; + tmp = strtof(str, &endptr); + + if (!endptr || *endptr || errno) { + if (!errno) + errno = EINVAL; + return SR_ERR; + } + + *ret = tmp; + return SR_OK; +} + +/** + * @private + * + * Convert a string representation of a numeric value to a float. The + * conversion is strict and will fail if the complete string does not represent + * a valid float. The function sets errno according to the details of the + * failure. + * + * @param str The string representation to convert. + * @param ret Pointer to float where the result of the conversion will be stored. + * + * @return SR_OK if conversion is successful, otherwise SR_ERR. + * + * @since 0.3.0 + */ +SR_PRIV int sr_atof(const char *str, float *ret) +{ + double tmp; + + if (sr_atod(str, &tmp) != SR_OK) + return SR_ERR; + + if ((float) tmp != tmp) { + errno = ERANGE; + return SR_ERR; + } + + *ret = (float) tmp; + return SR_OK; +} + +/** + * @private + * + * Convert a string representation of a numeric value to a float. The + * conversion is strict and will fail if the complete string does not represent + * a valid float. The function sets errno according to the details of the + * failure. This version ignores the locale. + * + * @param str The string representation to convert. + * @param ret Pointer to float where the result of the conversion will be stored. + * + * @return SR_OK if conversion is successful, otherwise SR_ERR. + * + * @since 0.3.0 + */ +SR_PRIV int sr_atof_ascii(const char *str, float *ret) +{ + double tmp; + char *endptr = NULL; + + errno = 0; + tmp = g_ascii_strtod(str, &endptr); + + if (!endptr || *endptr || errno) { + if (!errno) + errno = EINVAL; + return SR_ERR; + } + + /* FIXME This fails unexpectedly. Some other method to safel downcast + * needs to be found. Checking against FLT_MAX doesn't work as well. */ + /* + if ((float) tmp != tmp) { + errno = ERANGE; + sr_dbg("ERANGEEEE %e != %e", (float) tmp, tmp); + return SR_ERR; + } + */ + + *ret = (float) tmp; + return SR_OK; +} + +/** + * Convert a numeric value value to its "natural" string representation + * in SI units. + * + * E.g. a value of 3000000, with units set to "W", would be converted + * to "3 MW", 20000 to "20 kW", 31500 would become "31.5 kW". + * + * @param x The value to convert. + * @param unit The unit to append to the string, or NULL if the string + * has no units. + * + * @return A g_try_malloc()ed string representation of the samplerate value, + * or NULL upon errors. The caller is responsible to g_free() the + * memory. + */ +SR_API char *sr_si_string_u64(uint64_t x, const char *unit) +{ + uint8_t i; + uint64_t quot, divisor[] = { + SR_HZ(1), SR_KHZ(1), SR_MHZ(1), SR_GHZ(1), + SR_GHZ(1000), SR_GHZ(1000 * 1000), SR_GHZ(1000 * 1000 * 1000), + }; + const char *p, prefix[] = "\0kMGTPE"; + char fmt[16], fract[20] = "", *f; + + if (unit == NULL) + unit = ""; + + for (i = 0; (quot = x / divisor[i]) >= 1000; i++); + + if (i) { + sprintf(fmt, ".%%0%d"PRIu64, i * 3); + f = fract + sprintf(fract, fmt, x % divisor[i]) - 1; + + while (f >= fract && strchr("0.", *f)) + *f-- = 0; + } + + p = prefix + i; + + return g_strdup_printf("%" PRIu64 "%s %.1s%s", quot, fract, p, unit); +} + +/** + * Convert a numeric samplerate value to its "natural" string representation. + * + * E.g. a value of 3000000 would be converted to "3 MHz", 20000 to "20 kHz", + * 31500 would become "31.5 kHz". + * + * @param samplerate The samplerate in Hz. + * + * @return A g_try_malloc()ed string representation of the samplerate value, + * or NULL upon errors. The caller is responsible to g_free() the + * memory. + */ +SR_API char *sr_samplerate_string(uint64_t samplerate) +{ + return sr_si_string_u64(samplerate, "Hz"); } /** @@ -67,17 +279,21 @@ char *sr_samplerate_string(uint64_t samplerate) * E.g. a value of 3000000 would be converted to "3 us", 20000 to "50 ms". * * @param frequency The frequency in Hz. - * @return A malloc()ed string representation of the frequency value, - * or NULL upon errors. The caller is responsible to free() the memory. + * + * @return A g_try_malloc()ed string representation of the frequency value, + * or NULL upon errors. The caller is responsible to g_free() the + * memory. */ -char *sr_period_string(uint64_t frequency) +SR_API char *sr_period_string(uint64_t frequency) { char *o; int r; - o = malloc(30 + 1); /* Enough for a uint64_t as string + " ms". */ - if (!o) + /* Allocate enough for a uint64_t as string + " ms". */ + if (!(o = g_try_malloc0(30 + 1))) { + sr_err("%s: o malloc failed", __func__); return NULL; + } if (frequency >= SR_GHZ(1)) r = snprintf(o, 30, "%" PRIu64 " ns", frequency / 1000000000); @@ -90,7 +306,47 @@ char *sr_period_string(uint64_t frequency) if (r < 0) { /* Something went wrong... */ - free(o); + g_free(o); + return NULL; + } + + return o; +} + +/** + * Convert a numeric voltage value to the "natural" string representation + * of its voltage value. The voltage is specified as a rational number's + * numerator and denominator. + * + * E.g. a value of 300000 would be converted to "300mV", 2 to "2V". + * + * @param v_p The voltage numerator. + * @param v_q The voltage denominator. + * + * @return A g_try_malloc()ed string representation of the voltage value, + * or NULL upon errors. The caller is responsible to g_free() the + * memory. + */ +SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q) +{ + int r; + char *o; + + if (!(o = g_try_malloc0(30 + 1))) { + sr_err("%s: o malloc failed", __func__); + return NULL; + } + + if (v_q == 1000) + r = snprintf(o, 30, "%" PRIu64 "mV", v_p); + else if (v_q == 1) + r = snprintf(o, 30, "%" PRIu64 "V", v_p); + else + r = snprintf(o, 30, "%gV", (float)v_p / (float)v_q); + + if (r < 0) { + /* Something went wrong... */ + g_free(o); return NULL; } @@ -98,53 +354,69 @@ char *sr_period_string(uint64_t frequency) } /** - * TODO + * Parse a trigger specification string. + * + * @param sdi The device instance for which the trigger specification is + * intended. Must not be NULL. Also, sdi->driver and + * sdi->driver->info_get must not be NULL. + * @param triggerstring The string containing the trigger specification for + * one or more channels of this device. Entries for multiple channels are + * comma-separated. Triggers are specified in the form key=value, + * where the key is a channel number (or channel name) and the value is + * the requested trigger type. Valid trigger types currently + * include 'r' (rising edge), 'f' (falling edge), 'c' (any pin value + * change), '0' (low value), or '1' (high value). + * Example: "1=r,sck=f,miso=0,7=c" * - * @param device TODO - * @param triggerstring TODO - * @return TODO + * @return Pointer to a list of trigger types (strings), or NULL upon errors. + * The pointer list (if non-NULL) has as many entries as the + * respective device has channels (all physically available channels, + * not just enabled ones). Entries of the list which don't have + * a trigger value set in 'triggerstring' are NULL, the other entries + * contain the respective trigger type which is requested for the + * respective channel (e.g. "r", "c", and so on). */ -char **sr_parse_triggerstring(struct sr_device *device, - const char *triggerstring) +SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi, + const char *triggerstring) { GSList *l; - struct sr_probe *probe; - int max_probes, probenum, i; - char **tokens, **triggerlist, *trigger, *tc, *trigger_types; + GVariant *gvar; + struct sr_channel *ch; + int max_channels, channelnum, i; + char **tokens, **triggerlist, *trigger, *tc; + const char *trigger_types; gboolean error; - max_probes = g_slist_length(device->probes); + max_channels = g_slist_length(sdi->channels); error = FALSE; - if (!(triggerlist = g_try_malloc0(max_probes * sizeof(char *)))) { - sr_err("session file: %s: metafile malloc failed", __func__); + if (!(triggerlist = g_try_malloc0(max_channels * sizeof(char *)))) { + sr_err("%s: triggerlist malloc failed", __func__); return NULL; } - tokens = g_strsplit(triggerstring, ",", max_probes); - trigger_types = device->plugin->get_device_info(0, SR_DI_TRIGGER_TYPES); - if (trigger_types == NULL) + if (sdi->driver->config_list(SR_CONF_TRIGGER_TYPE, + &gvar, sdi, NULL) != SR_OK) { + sr_err("%s: Device doesn't support any triggers.", __func__); return NULL; + } + trigger_types = g_variant_get_string(gvar, NULL); + tokens = g_strsplit(triggerstring, ",", max_channels); for (i = 0; tokens[i]; i++) { - if (tokens[i][0] < '0' || tokens[i][0] > '9') { - /* Named probe */ - probenum = 0; - for (l = device->probes; l; l = l->next) { - probe = (struct sr_probe *)l->data; - if (probe->enabled - && !strncmp(probe->name, tokens[i], - strlen(probe->name))) { - probenum = probe->index; - break; - } + channelnum = -1; + for (l = sdi->channels; l; l = l->next) { + ch = (struct sr_channel *)l->data; + if (ch->enabled + && !strncmp(ch->name, tokens[i], + strlen(ch->name))) { + channelnum = ch->index; + break; } - } else { - probenum = strtol(tokens[i], NULL, 10); } - if (probenum < 1 || probenum > max_probes) { - sr_err("Invalid probe.\n"); + if (channelnum < 0 || channelnum >= max_channels) { + sr_err("Invalid channel."); error = TRUE; break; } @@ -152,22 +424,22 @@ char **sr_parse_triggerstring(struct sr_device *device, if ((trigger = strchr(tokens[i], '='))) { for (tc = ++trigger; *tc; tc++) { if (strchr(trigger_types, *tc) == NULL) { - sr_err("Unsupported trigger type " - "'%c'\n", *tc); + sr_err("Unsupported trigger " + "type '%c'.", *tc); error = TRUE; break; } } if (!error) - triggerlist[probenum - 1] = g_strdup(trigger); + triggerlist[channelnum] = g_strdup(trigger); } } g_strfreev(tokens); + g_variant_unref(gvar); if (error) { - for (i = 0; i < max_probes; i++) - if (triggerlist[i]) - g_free(triggerlist[i]); + for (i = 0; i < max_channels; i++) + g_free(triggerlist[i]); g_free(triggerlist); triggerlist = NULL; } @@ -186,22 +458,27 @@ char **sr_parse_triggerstring(struct sr_device *device, * Spaces (but not other whitespace) between value and suffix are allowed. * * @param sizestring A string containing a (decimal) size value. - * @return The string's size value as uint64_t. + * @param size Pointer to uint64_t which will contain the string's size value. * - * TODO: Error handling. + * @return SR_OK upon success, SR_ERR upon errors. */ -uint64_t sr_parse_sizestring(const char *sizestring) +SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size) { - int multiplier; - uint64_t val; + int multiplier, done; + double frac_part; char *s; - val = strtoull(sizestring, &s, 10); + *size = strtoull(sizestring, &s, 10); multiplier = 0; - while (s && *s && multiplier == 0) { + frac_part = 0; + done = FALSE; + while (s && *s && multiplier == 0 && !done) { switch (*s) { case ' ': break; + case '.': + frac_part = g_ascii_strtod(s, &s); + break; case 'k': case 'K': multiplier = SR_KHZ(1); @@ -215,15 +492,21 @@ uint64_t sr_parse_sizestring(const char *sizestring) multiplier = SR_GHZ(1); break; default: - val = 0; - multiplier = -1; + done = TRUE; + s--; } s++; } - if (multiplier > 0) - val *= multiplier; + if (multiplier > 0) { + *size *= multiplier; + *size += frac_part * multiplier; + } else + *size += frac_part; + + if (*s && strcasecmp(s, "Hz")) + return SR_ERR; - return val; + return SR_OK; } /** @@ -240,16 +523,17 @@ uint64_t sr_parse_sizestring(const char *sizestring) * @param timestring A string containing a (decimal) time value. * @return The string's time value as uint64_t, in milliseconds. * - * TODO: Error handling. - * TODO: Add support for "m" (minutes) and others. - * TODO: picoseconds? - * TODO: Allow both lower-case and upper-case. + * @todo Add support for "m" (minutes) and others. + * @todo Add support for picoseconds? + * @todo Allow both lower-case and upper-case? If no, document it. */ -uint64_t sr_parse_timestring(const char *timestring) +SR_API uint64_t sr_parse_timestring(const char *timestring) { uint64_t time_msec; char *s; + /* TODO: Error handling, logging. */ + time_msec = strtoull(timestring, &s, 10); if (time_msec == 0 && s == timestring) return 0; @@ -268,17 +552,75 @@ uint64_t sr_parse_timestring(const char *timestring) return time_msec; } -gboolean sr_parse_boolstring(const char *boolstr) +SR_API gboolean sr_parse_boolstring(const char *boolstr) { if (!boolstr) return FALSE; - if (!g_strcasecmp(boolstr, "true") || - !g_strcasecmp(boolstr, "yes") || - !g_strcasecmp(boolstr, "on") || - !g_strcasecmp(boolstr, "1")) + if (!g_ascii_strncasecmp(boolstr, "true", 4) || + !g_ascii_strncasecmp(boolstr, "yes", 3) || + !g_ascii_strncasecmp(boolstr, "on", 2) || + !g_ascii_strncasecmp(boolstr, "1", 1)) return TRUE; return FALSE; } +SR_API int sr_parse_period(const char *periodstr, uint64_t *p, uint64_t *q) +{ + char *s; + + *p = strtoull(periodstr, &s, 10); + if (*p == 0 && s == periodstr) + /* No digits found. */ + return SR_ERR_ARG; + + if (s && *s) { + while (*s == ' ') + s++; + if (!strcmp(s, "fs")) + *q = 1000000000000000ULL; + else if (!strcmp(s, "ps")) + *q = 1000000000000ULL; + else if (!strcmp(s, "ns")) + *q = 1000000000ULL; + else if (!strcmp(s, "us")) + *q = 1000000; + else if (!strcmp(s, "ms")) + *q = 1000; + else if (!strcmp(s, "s")) + *q = 1; + else + /* Must have a time suffix. */ + return SR_ERR_ARG; + } + + return SR_OK; +} + + +SR_API int sr_parse_voltage(const char *voltstr, uint64_t *p, uint64_t *q) +{ + char *s; + + *p = strtoull(voltstr, &s, 10); + if (*p == 0 && s == voltstr) + /* No digits found. */ + return SR_ERR_ARG; + + if (s && *s) { + while (*s == ' ') + s++; + if (!strcasecmp(s, "mv")) + *q = 1000L; + else if (!strcasecmp(s, "v")) + *q = 1; + else + /* Must have a base suffix. */ + return SR_ERR_ARG; + } + + return SR_OK; +} + +/** @} */