summaryrefslogtreecommitdiff
path: root/epan/column-info.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-08-26 17:14:39 -0700
committerGerald Combs <gerald@wireshark.org>2015-08-28 02:54:20 +0000
commitf19a173a8409ff62a77939e66b4a97d26cc5c149 (patch)
tree9530c97f8ebafd0d0a791cf1f08aa5f4e90fcdb7 /epan/column-info.h
parent01fb470acd71528bede068727b7614ae6f534c4f (diff)
downloadwireshark-f19a173a8409ff62a77939e66b4a97d26cc5c149.tar.gz
Speed up column sorting.
The GTK+ UI sequentially dissects and caches column strings for all rows before sorting a column. Do the same in the Qt UI, which can improve performance considerably. Don't colorize packets when sorting in the Qt UI unless it's necessary. When sorting in the Qt UI, let the user cancel the initial packet dissection. Note that we'll need to replace std::sort in order to cancel out of sorting. Use a pre-allocated and pre-compiled GRexex when we prime columns. Note that we probably shouldn't parse a regular expression there. Cache the last result of proto_registrar_get_byname. Note performance hot spots elsewhere in the code. To do: GeoIP in packet-ip.c is pretty slow. Bug: 11467 Change-Id: Ib34038fee08ef0319261faeffc4eca01e52f4bd3 Reviewed-on: https://code.wireshark.org/review/10275 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/column-info.h')
-rw-r--r--epan/column-info.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/column-info.h b/epan/column-info.h
index 5d2a242918..e78ef3a575 100644
--- a/epan/column-info.h
+++ b/epan/column-info.h
@@ -66,6 +66,7 @@ struct epan_column_info {
gint *col_last; /**< Last column number with a given format */
col_expr_t col_expr; /**< Column expressions and values */
gboolean writable; /**< writable or not @todo Are we still writing to the columns? */
+ GRegex *prime_regex; /**< Used to prime custom columns */
};
#ifdef __cplusplus