Hello,
On Mon, Aug 22, 2016 at 08:04:09PM -0700, Carsten Haitzler wrote:
> raster pushed a commit to branch master.
>
> http://git.enlightenment.org/core/efl.git/commit/?id=561f8eaa8faebe32b9a03cf9674c147cf0d6d9ab
>
> commit 561f8eaa8faebe32b9a03cf9674c147cf0d6d9ab
> Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
> Date: Tue Aug 23 11:59:37 2016 +0900
>
> efreet - save about 240-300k or so of memory used by efreet mime
>
> so efreet mime was loading a bunch of mime type info files, parsing
> them on startup and allocating memory to store all this mime info -
> globs, mimetype strings and more. all a big waste of memory as its
> allocated on the heap per process where its the SAME data files loaded
> every time.
>
> so make an efreet mime cache file and a tool to create it from mime
> files. mmap this file with all the hashes/strings in it so all that
> data is mmaped once in memory and shared between all processes and it
> is only paged in on demand - as actually read/needed so if your
> process doesnt need to know about mime stuff.. it wont touch it anyway.
>
> this saves about 240-300k or so of memory in my tests. this has not
> covered the mime MAGIC files which still consume memory and are on the
> heap. this is more complex so it will take more time to come up with a
> nice file format for the data that is nicely mmaped etc.
>
> @optimize
> ---
[snip]
> +
> EAPI int
> efreet_mime_init(void)
> {
> @@ -194,14 +386,15 @@ efreet_mime_init(void)
> }
>
> efreet_mime_endianess = efreet_mime_endian_check();
> -
> - monitors =
> eina_hash_string_superfast_new(EINA_FREE_CB(ecore_file_monitor_del));
> -
> efreet_mime_type_cache_clear();
>
> + _efreet_mimedb_update();
> +
> if (!efreet_mime_init_files())
> goto unregister_log_domain;
>
> + _efreet_mime_update_func = _efreet_mimedb_update;
> +
> return _efreet_mime_init_count;
>
> unregister_log_domain:
> @@ -228,6 +421,9 @@ efreet_mime_shutdown(void)
> if (--_efreet_mime_init_count != 0)
> return _efreet_mime_init_count;
>
> + _efreet_mimedb_shutdown();
> + _efreet_mime_update_func = NULL;
> +
> efreet_mime_icons_debug();
>
> IF_RELEASE(_mime_inode_symlink);
> @@ -241,10 +437,7 @@ efreet_mime_shutdown(void)
> IF_RELEASE(_mime_application_octet_stream);
> IF_RELEASE(_mime_text_plain);
>
> - IF_FREE_LIST(globs, efreet_mime_glob_free);
> IF_FREE_LIST(magics, efreet_mime_magic_free);
> - IF_FREE_HASH(monitors);
> - IF_FREE_HASH(wild);
> IF_FREE_HASH(mime_icons);
> eina_log_domain_unregister(_efreet_mime_log_dom);
> _efreet_mime_log_dom = -1;
> @@ -387,11 +580,10 @@ efreet_mime_magic_type_get(const char *file)
> EAPI const char *
> efreet_mime_globs_type_get(const char *file)
> {
> - Eina_List *l;
> - Efreet_Mime_Glob *g;
> char *sl, *p;
> - const char *s;
> - char *ext, *mime;
> + const char *s, *mime;
> + char *ext;
> + unsigned int i, n;
>
> EINA_SAFETY_ON_NULL_RETURN_VAL(file, NULL);
>
> @@ -406,25 +598,27 @@ efreet_mime_globs_type_get(const char *file)
> while (p)
> {
> p++;
> - if (p && (mime = eina_hash_find(wild, p))) return mime;
> + if (p && (mime = _efreet_mimedb_extn_find(p))) return mime;
> p = strchr(p, '.');
> }
> }
>
> - /* Fallback to the other globs if not found */
> - EINA_LIST_FOREACH(globs, l, g)
> + // Fallback to the other globs if not found
> + n = _efreet_mimedb_glob_count();
> + for (i = 0; i < n; i++)
> {
> - if (efreet_mime_glob_match(file, g->glob))
> - return g->mime;
> + s = _efreet_mimedb_glob_get(i);
> + if (efreet_mime_glob_match(file, s))
> + return _efreet_mimedb_glob_mime_get(i);
The upper line is introducing a problem.
Before the return was a stringshare, now it is not anymore.
I am not so sure if it is a good idea to fix it with
return eina_stringshare_add(_efreet_mimedb_glob_mime_get(i));
So i am letting you know this was here :)
Greetings
bu5hm4n
------------------------------------------------------------------------------
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
