mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #1781: little speedup of startup.

Browse Source 
Keys sort functions have been maken inline.
Decrease of memory usage: reimplemented
key_name_conv_tab_sorted array as array of pointers
instead of entire copy of key_name_conv_tab array.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2009-11-23 21:30:43 +03:00
parent 4fa7b56ada
commit e6851b18b3
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/keybind.c
View File

@ -914,7 +914,7 @@ name_keymap_comparator (const void *p1, const void *p2)
return str_casecmp (m1->name, m2->name); return str_casecmp (m1->name, m2->name);
} }
static void static inline void
sort_command_names (void) sort_command_names (void)
{ {
static gboolean has_been_sorted = FALSE; static gboolean has_been_sorted = FALSE;

39
src/tty/key.c
View File

@ -1235,26 +1235,28 @@ check_movement_keys (int key, int page_size, void *data, move_fn backfn,
static const size_t key_name_conv_tab_size = sizeof (key_name_conv_tab) / static const size_t key_name_conv_tab_size = sizeof (key_name_conv_tab) /
sizeof (key_name_conv_tab[0]) - 1; sizeof (key_name_conv_tab[0]) - 1;
static key_code_name_t key_name_conv_tab_sorted [sizeof (key_name_conv_tab) / static const key_code_name_t *key_name_conv_tab_sorted[sizeof (key_name_conv_tab) /
sizeof (key_name_conv_tab[0]) - 1]; sizeof (key_name_conv_tab[0]) - 1];
static int static int
key_code_name_comparator (const void *p1, const void *p2) key_code_name_comparator (const void *p1, const void *p2)
{ {
const key_code_name_t *n1 = (const key_code_name_t *) p1; const key_code_name_t *n1 = *(const key_code_name_t **) p1;
const key_code_name_t *n2 = (const key_code_name_t *) p2; const key_code_name_t *n2 = *(const key_code_name_t **) p2;
return str_casecmp (n1->name, n2->name); return str_casecmp (n1->name, n2->name);
} }
static void static inline void
sort_key_name_conv_tab (void) sort_key_name_conv_tab (void)
{ {
static gboolean has_been_sorted = FALSE; static gboolean has_been_sorted = FALSE;
if (!has_been_sorted) { if (!has_been_sorted) {
memcpy (key_name_conv_tab_sorted, key_name_conv_tab, size_t i;
sizeof (key_name_conv_tab_sorted)); for (i = 0; i <= key_name_conv_tab_size; i++)
key_name_conv_tab_sorted[i] = &key_name_conv_tab[i];
qsort (key_name_conv_tab_sorted, qsort (key_name_conv_tab_sorted,
key_name_conv_tab_size, sizeof (key_name_conv_tab_sorted[0]), key_name_conv_tab_size, sizeof (key_name_conv_tab_sorted[0]),
&key_code_name_comparator); &key_code_name_comparator);
@ -1267,7 +1269,8 @@ lookup_keyname (const char *keyname, int *lc_index)
{ {
if (keyname[0] != '\0') { if (keyname[0] != '\0') {
const key_code_name_t key = { 0, keyname, NULL, NULL }; const key_code_name_t key = { 0, keyname, NULL, NULL };
key_code_name_t *res; const key_code_name_t *keyp = &key;
key_code_name_t **res;
if (keyname[1] == '\0') { if (keyname[1] == '\0') {
*lc_index = -1; *lc_index = -1;
@ -1276,14 +1279,14 @@ lookup_keyname (const char *keyname, int *lc_index)
sort_key_name_conv_tab (); sort_key_name_conv_tab ();
res = bsearch (&key, key_name_conv_tab_sorted, res = bsearch (&keyp, key_name_conv_tab_sorted,
key_name_conv_tab_size, key_name_conv_tab_size,
sizeof (key_name_conv_tab_sorted[0]), sizeof (key_name_conv_tab_sorted[0]),
key_code_name_comparator); key_code_name_comparator);
if (res != NULL) { if (res != NULL) {
*lc_index = (int) (res - key_name_conv_tab_sorted); *lc_index = (int) (res - (key_code_name_t **) key_name_conv_tab_sorted);
return res->code; return (*res)->code;
} }
} }
@ -1346,29 +1349,29 @@ lookup_key (const char *keyname, char **label)
s = g_string_new (""); s = g_string_new ("");
if (use_meta != -1) { if (use_meta != -1) {
g_string_append (s, key_name_conv_tab_sorted[use_meta].shortcut); g_string_append (s, key_name_conv_tab_sorted[use_meta]->shortcut);
g_string_append_c (s, '-'); g_string_append_c (s, '-');
} }
if (use_ctrl != -1) { if (use_ctrl != -1) {
g_string_append (s, key_name_conv_tab_sorted[use_ctrl].shortcut); g_string_append (s, key_name_conv_tab_sorted[use_ctrl]->shortcut);
g_string_append_c (s, '-'); g_string_append_c (s, '-');
} }
if (use_shift != -1) { if (use_shift != -1) {
if (k < 127) if (k < 127)
g_string_append_c (s, (gchar) g_ascii_toupper ((gchar) k)); g_string_append_c (s, (gchar) g_ascii_toupper ((gchar) k));
else { else {
g_string_append (s, key_name_conv_tab_sorted[use_shift].shortcut); g_string_append (s, key_name_conv_tab_sorted[use_shift]->shortcut);
g_string_append_c (s, '-'); g_string_append_c (s, '-');
g_string_append (s, key_name_conv_tab_sorted[lc_index].shortcut); g_string_append (s, key_name_conv_tab_sorted[lc_index]->shortcut);
} }
} else if (k < 128) { } else if (k < 128) {
if ((k >= 'A') || (lc_index < 0) if ((k >= 'A') || (lc_index < 0)
|| (key_name_conv_tab_sorted[lc_index].shortcut == NULL)) || (key_name_conv_tab_sorted[lc_index]->shortcut == NULL))
g_string_append_c (s, (gchar) g_ascii_tolower ((gchar) k)); g_string_append_c (s, (gchar) g_ascii_tolower ((gchar) k));
else else
g_string_append (s, key_name_conv_tab_sorted[lc_index].shortcut); g_string_append (s, key_name_conv_tab_sorted[lc_index]->shortcut);
} else if ((lc_index != -1) && (key_name_conv_tab_sorted[lc_index].shortcut != NULL)) } else if ((lc_index != -1) && (key_name_conv_tab_sorted[lc_index]->shortcut != NULL))
g_string_append (s, key_name_conv_tab_sorted[lc_index].shortcut); g_string_append (s, key_name_conv_tab_sorted[lc_index]->shortcut);
else else
g_string_append_c (s, (gchar) g_ascii_tolower ((gchar) key)); g_string_append_c (s, (gchar) g_ascii_tolower ((gchar) key));