/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "defs.h"
#include <glib.h>
#include <glib/gi18n.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <time.h>
#include "utils.h"
#include "procmsg.h"
#include "codeconv.h"
+#include "timing.h"
+
+#if G_BYTE_ORDER == G_BIG_ENDIAN
+#define bswap_32(x) \
+ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
+ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+
+#define MMAP_TO_GUINT32(x) \
+ (((x[3]&0xff)) | \
+ ((x[2]&0xff) << 8) | \
+ ((x[1]&0xff) << 16) | \
+ ((x[0]&0xff) << 24))
+
+#define MMAP_TO_GUINT32_SWAPPED(x) \
+ (((x[0]&0xff)) | \
+ ((x[1]&0xff) << 8) | \
+ ((x[2]&0xff) << 16) | \
+ ((x[3]&0xff) << 24))
+
+static gboolean msgcache_use_mmap_read = TRUE;
+static gboolean msgcache_use_mmap_write = FALSE;
+
+#else
+#define bswap_32(x) (x)
+
+#define MMAP_TO_GUINT32(x) \
+ (((x[0]&0xff)) | \
+ ((x[1]&0xff) << 8) | \
+ ((x[2]&0xff) << 16) | \
+ ((x[3]&0xff) << 24))
+
+#define MMAP_TO_GUINT32_SWAPPED(x) \
+ (((x[0]&0xff)) | \
+ ((x[1]&0xff) << 8) | \
+ ((x[2]&0xff) << 16) | \
+ ((x[3]&0xff) << 24))
+
+static gboolean msgcache_use_mmap_read = TRUE;
+static gboolean msgcache_use_mmap_write = FALSE;
+#endif
+
+static gboolean swapping = TRUE;
typedef enum
{
MsgInfoList *msgcache_get_msg_list(MsgCache *cache)
{
MsgInfoList *msg_list = NULL;
-
+ START_TIMING("");
g_return_val_if_fail(cache != NULL, NULL);
g_hash_table_foreach((GHashTable *)cache->msgnum_table, msgcache_get_msg_list_func, (gpointer)&msg_list);
cache->last_access = time(NULL);
msg_list = g_slist_reverse(msg_list);
-
+ END_TIMING();
return msg_list;
}
if ((tmp_len = msgcache_read_cache_data_str(fp, &data, conv)) < 0) { \
procmsg_msginfo_free(msginfo); \
error = TRUE; \
- break; \
+ goto bail_err; \
} \
total_len += tmp_len; \
}
guint32 idata; \
size_t ni; \
\
- if ((ni = fread(&idata, 1, sizeof(idata), fp)) != sizeof(idata)) { \
+ if ((ni = fread(&idata, sizeof(idata), 1, fp)) != 1) { \
g_warning("read_int: Cache data corrupted, read %d of %d at " \
- "offset %d\n", ni, sizeof(idata), ftell(fp)); \
+ "offset %ld\n", ni, sizeof(idata), ftell(fp)); \
procmsg_msginfo_free(msginfo); \
error = TRUE; \
- break; \
+ goto bail_err; \
} else \
- n = idata;\
+ n = swapping ? bswap_32(idata) : (idata);\
+}
+
+#define GET_CACHE_DATA_INT(n) \
+{ \
+ n = (swapping ? (MMAP_TO_GUINT32_SWAPPED(walk_data)):(MMAP_TO_GUINT32(walk_data))); \
+ walk_data += 4; rem_len -= 4; \
+}
+
+#define GET_CACHE_DATA(data, total_len) \
+{ \
+ GET_CACHE_DATA_INT(tmp_len); \
+ if ((tmp_len = msgcache_get_cache_data_str(walk_data, &data, tmp_len, conv)) < 0) { \
+ printf("error at rem_len:%d\n", rem_len);\
+ procmsg_msginfo_free(msginfo); \
+ error = TRUE; \
+ goto bail_err; \
+ } \
+ total_len += tmp_len; \
+ walk_data += tmp_len; rem_len -= tmp_len; \
+}
+
+
+#define WRITE_CACHE_DATA_INT(n, fp) \
+{ \
+ guint32 idata; \
+ \
+ idata = (guint32)bswap_32(n); \
+ if (fwrite(&idata, sizeof(idata), 1, fp) != 1) \
+ w_err = 1; \
+ wrote += 4; \
}
-#define WRITE_CACHE_DATA_INT(n, fp) \
-{ \
- guint32 idata; \
- \
- idata = (guint32)n; \
- fwrite(&idata, sizeof(idata), 1, fp); \
+#define PUT_CACHE_DATA_INT(n) \
+{ \
+ walk_data[0]=(((guint32)n)&0x000000ff); \
+ walk_data[1]=(((guint32)n)&0x0000ff00)>>8; \
+ walk_data[2]=(((guint32)n)&0x00ff0000)>>16; \
+ walk_data[3]=(((guint32)n)&0xff000000)>>24; \
+ walk_data += 4; \
+ wrote += 4; \
}
#define WRITE_CACHE_DATA(data, fp) \
{ \
- size_t len; \
- if (data == NULL) \
- len = 0; \
- else \
- len = strlen(data); \
- WRITE_CACHE_DATA_INT(len, fp); \
- if (len > 0) { \
- fwrite(data, len, 1, fp); \
+ size_t len; \
+ if (data == NULL) \
+ len = 0; \
+ else \
+ len = strlen(data); \
+ WRITE_CACHE_DATA_INT(len, fp); \
+ if (w_err == 0 && len > 0) { \
+ if (fwrite(data, 1, len, fp) != len) \
+ w_err = 1; \
+ wrote += len; \
} \
}
+#define PUT_CACHE_DATA(data) \
+{ \
+ size_t len; \
+ if (data == NULL) \
+ len = 0; \
+ else \
+ len = strlen(data); \
+ PUT_CACHE_DATA_INT(len); \
+ if (len > 0) { \
+ memcpy(walk_data, data, len); \
+ walk_data += len; \
+ wrote += len; \
+ } \
+}
+
static FILE *msgcache_open_data_file(const gchar *file, guint version,
DataOpenMode mode,
gchar *buf, size_t buf_size)
g_return_val_if_fail(file != NULL, NULL);
if (mode == DATA_WRITE) {
- if ((fp = fopen(file, "wb")) == NULL) {
+ int w_err = 0, wrote = 0;
+ if ((fp = g_fopen(file, "w+")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return NULL;
}
FILE_OP_ERROR(file, "chmod");
WRITE_CACHE_DATA_INT(version, fp);
+ if (w_err != 0) {
+ g_warning("failed to write int\n");
+ fclose(fp);
+ return NULL;
+ }
return fp;
}
/* check version */
- if ((fp = fopen(file, "rb")) == NULL)
+ if ((fp = g_fopen(file, "rb")) == NULL)
debug_print("Mark/Cache file '%s' not found\n", file);
else {
if (buf && buf_size > 0)
setvbuf(fp, buf, _IOFBF, buf_size);
if (fread(&data_ver, sizeof(data_ver), 1, fp) != 1 ||
- version != data_ver) {
- g_message("%s: Mark/Cache version is different (%u != %u). Discarding it.\n",
- file, data_ver, version);
+ version != bswap_32(data_ver)) {
+ g_message("%s: Mark/Cache version is different (%u != %u).\n",
+ file, bswap_32(data_ver), version);
fclose(fp);
fp = NULL;
}
+ data_ver = bswap_32(data_ver);
}
if (mode == DATA_READ)
if (fp) {
/* reopen with append mode */
fclose(fp);
- if ((fp = fopen(file, "ab")) == NULL)
+ if ((fp = g_fopen(file, "ab")) == NULL)
FILE_OP_ERROR(file, "fopen");
} else {
/* open with overwrite mode if mark file doesn't exist or
guint32 len;
*str = NULL;
- if ((ni = fread(&len, 1, sizeof(len), fp) != sizeof(len)) ||
- len > G_MAXINT) {
- g_warning("read_data_str: Cache data (len) corrupted, read %d "
- "of %d bytes at offset %d\n", ni, sizeof(len),
- ftell(fp));
- return -1;
+ if (!swapping) {
+ if ((ni = fread(&len, sizeof(len), 1, fp) != 1) ||
+ len > G_MAXINT) {
+ g_warning("read_data_str: Cache data (len) corrupted, read %d "
+ "of %d bytes at offset %ld\n", ni, sizeof(len),
+ ftell(fp));
+ return -1;
+ }
+ } else {
+ if ((ni = fread(&len, sizeof(len), 1, fp) != 1) ||
+ bswap_32(len) > G_MAXINT) {
+ g_warning("read_data_str: Cache data (len) corrupted, read %d "
+ "of %d bytes at offset %ld\n", ni, sizeof(len),
+ ftell(fp));
+ return -1;
+ }
+ len = bswap_32(len);
}
if (len == 0)
return 0;
- tmpstr = g_malloc(len + 1);
+ tmpstr = g_try_malloc(len + 1);
+
+ if(tmpstr == NULL) {
+ g_warning("read_data_str: can't g_malloc %d bytes - cache data probably corrupted.\n", len);
+ return -1;
+ }
if ((ni = fread(tmpstr, 1, len, fp)) != len) {
g_warning("read_data_str: Cache data corrupted, read %d of %d "
- "bytes at offset %d\n",
+ "bytes at offset %ld\n",
ni, len, ftell(fp));
g_free(tmpstr);
return -1;
return len;
}
+static gint msgcache_get_cache_data_str(gchar *src, gchar **str, gint len,
+ StringConverter *conv)
+{
+ gchar *tmpstr = NULL;
+
+ *str = NULL;
+
+ if (len == 0)
+ return 0;
+
+ tmpstr = g_try_malloc(len + 1);
+
+ if(tmpstr == NULL) {
+ g_warning("read_data_str: can't g_malloc %d bytes - cache data probably corrupted.\n", len);
+ return -1;
+ }
+
+ strncpy(tmpstr, src, len);
+
+ tmpstr[len] = 0;
+
+ if (conv != NULL) {
+ *str = conv->convert(conv, tmpstr);
+ g_free(tmpstr);
+ } else
+ *str = tmpstr;
+
+ return len;
+}
+
gchar *strconv_strdup_convert(StringConverter *conv, gchar *srcstr)
{
return g_strdup(srcstr);
const gchar *dstcharset = NULL;
gchar *ref = NULL;
guint memusage = 0;
- guint tmp_len = 0;
-#if 0
- struct timeval start;
- struct timeval end;
- struct timeval diff;
- gettimeofday(&start, NULL);
-#endif
+ gint tmp_len = 0, map_len = -1;
+ char *cache_data = NULL;
+ struct stat st;
+
g_return_val_if_fail(cache_file != NULL, NULL);
g_return_val_if_fail(item != NULL, NULL);
+ swapping = TRUE;
+
+ /* In case we can't open the mark file with MARK_VERSION, check if we can open it with the
+ * swapped MARK_VERSION. As msgcache_open_data_file swaps it too, if this succeeds,
+ * it means it's the old version (not little-endian) on a big-endian machine. The code has
+ * no effect on x86 as their file doesn't change. */
+
if ((fp = msgcache_open_data_file
- (cache_file, CACHE_VERSION, DATA_READ, file_buf, sizeof(file_buf))) == NULL)
- return NULL;
+ (cache_file, CACHE_VERSION, DATA_READ, file_buf, sizeof(file_buf))) == NULL) {
+ if ((fp = msgcache_open_data_file
+ (cache_file, bswap_32(CACHE_VERSION), DATA_READ, file_buf, sizeof(file_buf))) == NULL)
+ return NULL;
+ else
+ swapping = FALSE;
+ }
- debug_print("\tReading message cache from %s...\n", cache_file);
+ debug_print("\tReading %sswapped message cache from %s...\n", swapping?"":"un", cache_file);
- if (item->stype == F_QUEUE) {
+ if (folder_has_parent_of_type(item, F_QUEUE)) {
tmp_flags |= MSG_QUEUED;
- } else if (item->stype == F_DRAFT) {
+ } else if (folder_has_parent_of_type(item, F_DRAFT)) {
tmp_flags |= MSG_DRAFT;
}
if (srccharset == NULL || dstcharset == NULL) {
conv = NULL;
} else if (strcmp(srccharset, dstcharset) == 0) {
- StrdupConverter *strdupconv;
-
- debug_print("using StrdupConverter\n");
+ debug_print("using Noop Converter\n");
- strdupconv = g_new0(StrdupConverter, 1);
- strdupconv->converter.convert = strconv_strdup_convert;
- strdupconv->converter.free = NULL;
-
- conv = (StringConverter *) strdupconv;
+ conv = NULL;
} else {
CharsetConverter *charsetconv;
g_free(srccharset);
cache = msgcache_new();
- g_hash_table_freeze(cache->msgnum_table);
- g_hash_table_freeze(cache->msgid_table);
- while (fread(&num, sizeof(num), 1, fp) == 1) {
- msginfo = procmsg_msginfo_new();
- msginfo->msgnum = num;
- memusage += sizeof(MsgInfo);
-
- READ_CACHE_DATA_INT(msginfo->size, fp);
- READ_CACHE_DATA_INT(msginfo->mtime, fp);
- READ_CACHE_DATA_INT(msginfo->date_t, fp);
- READ_CACHE_DATA_INT(msginfo->flags.tmp_flags, fp);
-
- READ_CACHE_DATA(msginfo->fromname, fp, memusage);
-
- READ_CACHE_DATA(msginfo->date, fp, memusage);
- READ_CACHE_DATA(msginfo->from, fp, memusage);
- READ_CACHE_DATA(msginfo->to, fp, memusage);
- READ_CACHE_DATA(msginfo->cc, fp, memusage);
- READ_CACHE_DATA(msginfo->newsgroups, fp, memusage);
- READ_CACHE_DATA(msginfo->subject, fp, memusage);
- READ_CACHE_DATA(msginfo->msgid, fp, memusage);
- READ_CACHE_DATA(msginfo->inreplyto, fp, memusage);
- READ_CACHE_DATA(msginfo->xref, fp, memusage);
-
- READ_CACHE_DATA_INT(msginfo->planned_download, fp);
- READ_CACHE_DATA_INT(msginfo->total_size, fp);
- READ_CACHE_DATA_INT(refnum, fp);
-
- for (; refnum != 0; refnum--) {
- ref = NULL;
+ if (msgcache_use_mmap_read == TRUE) {
+ if (fstat(fileno(fp), &st) >= 0)
+ map_len = st.st_size;
+ else
+ map_len = -1;
+ if (map_len > 0)
+ cache_data = mmap(NULL, map_len, PROT_READ, MAP_PRIVATE, fileno(fp), 0);
+ } else {
+ cache_data = NULL;
+ }
+ if (cache_data != NULL && cache_data != MAP_FAILED) {
+ int rem_len = map_len-ftell(fp);
+ char *walk_data = cache_data+ftell(fp);
+
+ while(rem_len > 0) {
+ GET_CACHE_DATA_INT(num);
+
+ msginfo = procmsg_msginfo_new();
+ msginfo->msgnum = num;
+ memusage += sizeof(MsgInfo);
+
+ GET_CACHE_DATA_INT(msginfo->size);
+ GET_CACHE_DATA_INT(msginfo->mtime);
+ GET_CACHE_DATA_INT(msginfo->date_t);
+ GET_CACHE_DATA_INT(msginfo->flags.tmp_flags);
+
+ GET_CACHE_DATA(msginfo->fromname, memusage);
+
+ GET_CACHE_DATA(msginfo->date, memusage);
+ GET_CACHE_DATA(msginfo->from, memusage);
+ GET_CACHE_DATA(msginfo->to, memusage);
+ GET_CACHE_DATA(msginfo->cc, memusage);
+ GET_CACHE_DATA(msginfo->newsgroups, memusage);
+ GET_CACHE_DATA(msginfo->subject, memusage);
+ GET_CACHE_DATA(msginfo->msgid, memusage);
+ GET_CACHE_DATA(msginfo->inreplyto, memusage);
+ GET_CACHE_DATA(msginfo->xref, memusage);
+
+ GET_CACHE_DATA_INT(msginfo->planned_download);
+ GET_CACHE_DATA_INT(msginfo->total_size);
+ GET_CACHE_DATA_INT(refnum);
+
+ for (; refnum != 0; refnum--) {
+ ref = NULL;
+
+ GET_CACHE_DATA(ref, memusage);
+
+ if (ref && *ref)
+ msginfo->references =
+ g_slist_prepend(msginfo->references, ref);
+ }
+ if (msginfo->references)
+ msginfo->references =
+ g_slist_reverse(msginfo->references);
- READ_CACHE_DATA(ref, fp, memusage);
+ msginfo->folder = item;
+ msginfo->flags.tmp_flags |= tmp_flags;
- if (ref && strlen(ref))
- msginfo->references =
- g_slist_prepend(msginfo->references, ref);
+ g_hash_table_insert(cache->msgnum_table, &msginfo->msgnum, msginfo);
+ if(msginfo->msgid)
+ g_hash_table_insert(cache->msgid_table, msginfo->msgid, msginfo);
}
- if (msginfo->references)
- msginfo->references =
- g_slist_reverse(msginfo->references);
+
+ munmap(cache_data, map_len);
+ } else {
+ while (fread(&num, sizeof(num), 1, fp) == 1) {
+ if (swapping)
+ num = bswap_32(num);
+
+ msginfo = procmsg_msginfo_new();
+ msginfo->msgnum = num;
+ memusage += sizeof(MsgInfo);
+
+ READ_CACHE_DATA_INT(msginfo->size, fp);
+ READ_CACHE_DATA_INT(msginfo->mtime, fp);
+ READ_CACHE_DATA_INT(msginfo->date_t, fp);
+ READ_CACHE_DATA_INT(msginfo->flags.tmp_flags, fp);
+
+ READ_CACHE_DATA(msginfo->fromname, fp, memusage);
+
+ READ_CACHE_DATA(msginfo->date, fp, memusage);
+ READ_CACHE_DATA(msginfo->from, fp, memusage);
+ READ_CACHE_DATA(msginfo->to, fp, memusage);
+ READ_CACHE_DATA(msginfo->cc, fp, memusage);
+ READ_CACHE_DATA(msginfo->newsgroups, fp, memusage);
+ READ_CACHE_DATA(msginfo->subject, fp, memusage);
+ READ_CACHE_DATA(msginfo->msgid, fp, memusage);
+ READ_CACHE_DATA(msginfo->inreplyto, fp, memusage);
+ READ_CACHE_DATA(msginfo->xref, fp, memusage);
+
+ READ_CACHE_DATA_INT(msginfo->planned_download, fp);
+ READ_CACHE_DATA_INT(msginfo->total_size, fp);
+ READ_CACHE_DATA_INT(refnum, fp);
+
+ for (; refnum != 0; refnum--) {
+ ref = NULL;
+
+ READ_CACHE_DATA(ref, fp, memusage);
+
+ if (ref && *ref)
+ msginfo->references =
+ g_slist_prepend(msginfo->references, ref);
+ }
+ if (msginfo->references)
+ msginfo->references =
+ g_slist_reverse(msginfo->references);
- msginfo->folder = item;
- msginfo->flags.tmp_flags |= tmp_flags;
+ msginfo->folder = item;
+ msginfo->flags.tmp_flags |= tmp_flags;
- g_hash_table_insert(cache->msgnum_table, &msginfo->msgnum, msginfo);
- if(msginfo->msgid)
- g_hash_table_insert(cache->msgid_table, msginfo->msgid, msginfo);
+ g_hash_table_insert(cache->msgnum_table, &msginfo->msgnum, msginfo);
+ if(msginfo->msgid)
+ g_hash_table_insert(cache->msgid_table, msginfo->msgid, msginfo);
+ }
}
+bail_err:
fclose(fp);
- g_hash_table_thaw(cache->msgnum_table);
- g_hash_table_thaw(cache->msgid_table);
if (conv != NULL) {
if (conv->free != NULL)
debug_print("done. (%d items read)\n", g_hash_table_size(cache->msgnum_table));
debug_print("Cache size: %d messages, %d byte\n", g_hash_table_size(cache->msgnum_table), cache->memusage);
-#if 0
- gettimeofday(&end, NULL);
- timersub(&end, &start, &diff);
- printf("spent %d seconds %d usages %d;%d\n", diff.tv_sec, diff.tv_usec, cache->memusage, memusage);
-#endif
return cache;
}
MsgInfo *msginfo;
MsgPermFlags perm_flags;
guint32 num;
-
- if ((fp = msgcache_open_data_file(mark_file, MARK_VERSION, DATA_READ, NULL, 0)) == NULL)
- return;
-
- debug_print("\tReading message marks from %s...\n", mark_file);
-
- while (fread(&num, sizeof(num), 1, fp) == 1) {
- if (fread(&perm_flags, sizeof(perm_flags), 1, fp) != 1) break;
-
- msginfo = g_hash_table_lookup(cache->msgnum_table, &num);
- if(msginfo) {
- msginfo->flags.perm_flags = perm_flags;
+ gint map_len = -1;
+ char *cache_data = NULL;
+ struct stat st;
+
+ swapping = TRUE;
+
+ /* In case we can't open the mark file with MARK_VERSION, check if we can open it with the
+ * swapped MARK_VERSION. As msgcache_open_data_file swaps it too, if this succeeds,
+ * it means it's the old version (not little-endian) on a big-endian machine. The code has
+ * no effect on x86 as their file doesn't change. */
+
+ if ((fp = msgcache_open_data_file(mark_file, MARK_VERSION, DATA_READ, NULL, 0)) == NULL) {
+ /* see if it isn't swapped ? */
+ if ((fp = msgcache_open_data_file(mark_file, bswap_32(MARK_VERSION), DATA_READ, NULL, 0)) == NULL)
+ return;
+ else
+ swapping = FALSE; /* yay */
+ }
+ debug_print("reading %sswapped mark file.\n", swapping?"":"un");
+
+ if (msgcache_use_mmap_read) {
+ if (fstat(fileno(fp), &st) >= 0)
+ map_len = st.st_size;
+ else
+ map_len = -1;
+ if (map_len > 0)
+ cache_data = mmap(NULL, map_len, PROT_READ, MAP_PRIVATE, fileno(fp), 0);
+ } else {
+ cache_data = NULL;
+ }
+ if (cache_data != NULL && cache_data != MAP_FAILED) {
+ int rem_len = map_len-ftell(fp);
+ char *walk_data = cache_data+ftell(fp);
+
+ while(rem_len > 0) {
+ GET_CACHE_DATA_INT(num);
+ GET_CACHE_DATA_INT(perm_flags);
+ msginfo = g_hash_table_lookup(cache->msgnum_table, &num);
+ if(msginfo) {
+ msginfo->flags.perm_flags = perm_flags;
+ }
}
+ munmap(cache_data, map_len);
+ } else {
+ while (fread(&num, sizeof(num), 1, fp) == 1) {
+ if (swapping)
+ num = bswap_32(num);
+ if (fread(&perm_flags, sizeof(perm_flags), 1, fp) != 1) break;
+ if (swapping)
+ perm_flags = bswap_32(perm_flags);
+ msginfo = g_hash_table_lookup(cache->msgnum_table, &num);
+ if(msginfo) {
+ msginfo->flags.perm_flags = perm_flags;
+ }
+ }
}
fclose(fp);
}
-void msgcache_write_cache(MsgInfo *msginfo, FILE *fp)
+static int msgcache_write_cache(MsgInfo *msginfo, FILE *fp)
{
MsgTmpFlags flags = msginfo->flags.tmp_flags & MSG_CACHED_FLAG_MASK;
GSList *cur;
+ int w_err = 0, wrote = 0;
WRITE_CACHE_DATA_INT(msginfo->msgnum, fp);
WRITE_CACHE_DATA_INT(msginfo->size, fp);
for (cur = msginfo->references; cur != NULL; cur = cur->next) {
WRITE_CACHE_DATA((gchar *)cur->data, fp);
}
+ return w_err ? -1 : wrote;
}
-static void msgcache_write_flags(MsgInfo *msginfo, FILE *fp)
+static int msgcache_write_mmap_cache(MsgInfo *msginfo, char *walk_data)
{
- MsgPermFlags flags = msginfo->flags.perm_flags;
+ MsgTmpFlags flags = msginfo->flags.tmp_flags & MSG_CACHED_FLAG_MASK;
+ GSList *cur;
+ int wrote = 0;
+
+ PUT_CACHE_DATA_INT(msginfo->msgnum);
+ PUT_CACHE_DATA_INT(msginfo->size);
+ PUT_CACHE_DATA_INT(msginfo->mtime);
+ PUT_CACHE_DATA_INT(msginfo->date_t);
+ PUT_CACHE_DATA_INT(flags);
+ PUT_CACHE_DATA(msginfo->fromname);
+
+ PUT_CACHE_DATA(msginfo->date);
+ PUT_CACHE_DATA(msginfo->from);
+ PUT_CACHE_DATA(msginfo->to);
+ PUT_CACHE_DATA(msginfo->cc);
+ PUT_CACHE_DATA(msginfo->newsgroups);
+ PUT_CACHE_DATA(msginfo->subject);
+ PUT_CACHE_DATA(msginfo->msgid);
+ PUT_CACHE_DATA(msginfo->inreplyto);
+ PUT_CACHE_DATA(msginfo->xref);
+ PUT_CACHE_DATA_INT(msginfo->planned_download);
+ PUT_CACHE_DATA_INT(msginfo->total_size);
+
+ PUT_CACHE_DATA_INT(g_slist_length(msginfo->references));
+
+ for (cur = msginfo->references; cur != NULL; cur = cur->next) {
+ PUT_CACHE_DATA((gchar *)cur->data);
+ }
+ return wrote;
+}
+static int msgcache_write_flags(MsgInfo *msginfo, FILE *fp)
+{
+ MsgPermFlags flags = msginfo->flags.perm_flags;
+ int w_err = 0, wrote = 0;
WRITE_CACHE_DATA_INT(msginfo->msgnum, fp);
WRITE_CACHE_DATA_INT(flags, fp);
+ return w_err ? -1 : wrote;
+}
+
+static int msgcache_write_mmap_flags(MsgInfo *msginfo, char *walk_data)
+{
+ MsgPermFlags flags = msginfo->flags.perm_flags;
+ int wrote = 0;
+
+ PUT_CACHE_DATA_INT(msginfo->msgnum);
+ PUT_CACHE_DATA_INT(flags);
+ return wrote;
}
struct write_fps
{
FILE *cache_fp;
FILE *mark_fp;
+ char *cache_data;
+ char *mark_data;
+ int error;
+ guint cache_size;
+ guint mark_size;
};
static void msgcache_write_func(gpointer key, gpointer value, gpointer user_data)
{
MsgInfo *msginfo;
struct write_fps *write_fps;
+ int tmp;
+
+ msginfo = (MsgInfo *)value;
+ write_fps = user_data;
+
+ tmp = msgcache_write_cache(msginfo, write_fps->cache_fp);
+ if (tmp < 0)
+ write_fps->error = 1;
+ else
+ write_fps->cache_size += tmp;
+ tmp= msgcache_write_flags(msginfo, write_fps->mark_fp);
+ if (tmp < 0)
+ write_fps->error = 1;
+ else
+ write_fps->mark_size += tmp;
+}
+
+static void msgcache_write_mmap_func(gpointer key, gpointer value, gpointer user_data)
+{
+ MsgInfo *msginfo;
+ struct write_fps *write_fps;
+ int tmp;
msginfo = (MsgInfo *)value;
write_fps = user_data;
- msgcache_write_cache(msginfo, write_fps->cache_fp);
- msgcache_write_flags(msginfo, write_fps->mark_fp);
+ tmp = msgcache_write_mmap_cache(msginfo, write_fps->cache_data);
+ write_fps->cache_size += tmp;
+ write_fps->cache_data += tmp;
+ tmp = msgcache_write_mmap_flags(msginfo, write_fps->mark_data);
+ write_fps->mark_size += tmp;
+ write_fps->mark_data += tmp;
}
gint msgcache_write(const gchar *cache_file, const gchar *mark_file, MsgCache *cache)
{
struct write_fps write_fps;
-
+ gchar *new_cache, *new_mark;
+ int w_err = 0, wrote = 0;
+ gint map_len = -1;
+ char *cache_data = NULL;
+ char *mark_data = NULL;
+ START_TIMING("");
g_return_val_if_fail(cache_file != NULL, -1);
g_return_val_if_fail(mark_file != NULL, -1);
g_return_val_if_fail(cache != NULL, -1);
- write_fps.cache_fp = msgcache_open_data_file(cache_file, CACHE_VERSION,
+ new_cache = g_strconcat(cache_file, ".new", NULL);
+ new_mark = g_strconcat(mark_file, ".new", NULL);
+
+ write_fps.error = 0;
+ write_fps.cache_size = 0;
+ write_fps.mark_size = 0;
+ write_fps.cache_fp = msgcache_open_data_file(new_cache, CACHE_VERSION,
DATA_WRITE, NULL, 0);
- if (write_fps.cache_fp == NULL)
+ if (write_fps.cache_fp == NULL) {
+ g_free(new_cache);
+ g_free(new_mark);
return -1;
+ }
WRITE_CACHE_DATA(CS_UTF_8, write_fps.cache_fp);
- write_fps.mark_fp = msgcache_open_data_file(mark_file, MARK_VERSION,
+ if (w_err != 0) {
+ g_warning("failed to write charset\n");
+ fclose(write_fps.cache_fp);
+ g_unlink(new_cache);
+ g_free(new_cache);
+ g_free(new_mark);
+ return -1;
+ }
+
+ write_fps.mark_fp = msgcache_open_data_file(new_mark, MARK_VERSION,
DATA_WRITE, NULL, 0);
if (write_fps.mark_fp == NULL) {
fclose(write_fps.cache_fp);
+ g_unlink(new_cache);
+ g_free(new_cache);
+ g_free(new_mark);
return -1;
}
- debug_print("\tWriting message cache to %s and %s...\n", cache_file, mark_file);
+ debug_print("\tWriting message cache to %s and %s...\n", new_cache, new_mark);
- if (change_file_mode_rw(write_fps.cache_fp, cache_file) < 0)
- FILE_OP_ERROR(cache_file, "chmod");
+ if (change_file_mode_rw(write_fps.cache_fp, new_cache) < 0)
+ FILE_OP_ERROR(new_cache, "chmod");
- g_hash_table_foreach(cache->msgnum_table, msgcache_write_func, (gpointer)&write_fps);
+ write_fps.cache_size = ftell(write_fps.cache_fp);
+ write_fps.mark_size = ftell(write_fps.mark_fp);
+ if (msgcache_use_mmap_write && cache->memusage > 0) {
+ map_len = cache->memusage;
+ if (ftruncate(fileno(write_fps.cache_fp), (off_t)map_len) == 0) {
+ cache_data = mmap(NULL, map_len, PROT_WRITE, MAP_SHARED,
+ fileno(write_fps.cache_fp), 0);
+ }
+ if (cache_data != NULL && cache_data != MAP_FAILED) {
+ if (ftruncate(fileno(write_fps.mark_fp), (off_t)map_len) == 0) {
+ mark_data = mmap(NULL, map_len, PROT_WRITE, MAP_SHARED,
+ fileno(write_fps.mark_fp), 0);
+ }
+ if (mark_data == NULL || mark_data == MAP_FAILED) {
+ munmap(cache_data, map_len);
+ cache_data = NULL;
+ }
+ }
+ }
+ if (cache_data != NULL && cache_data != MAP_FAILED) {
+ write_fps.cache_data = cache_data + ftell(write_fps.cache_fp);
+ write_fps.mark_data = mark_data + ftell(write_fps.mark_fp);
+ g_hash_table_foreach(cache->msgnum_table, msgcache_write_mmap_func, (gpointer)&write_fps);
+ munmap(cache_data, map_len);
+ munmap(mark_data, map_len);
+ ftruncate(fileno(write_fps.cache_fp), write_fps.cache_size);
+ ftruncate(fileno(write_fps.mark_fp), write_fps.mark_size);
+ } else {
+ g_hash_table_foreach(cache->msgnum_table, msgcache_write_func, (gpointer)&write_fps);
+ }
fclose(write_fps.cache_fp);
fclose(write_fps.mark_fp);
- cache->last_access = time(NULL);
+ if (write_fps.error != 0) {
+ g_unlink(new_cache);
+ g_unlink(new_mark);
+ g_free(new_cache);
+ g_free(new_mark);
+ return -1;
+ } else {
+ move_file(new_cache, cache_file, TRUE);
+ move_file(new_mark, mark_file, TRUE);
+ cache->last_access = time(NULL);
+ }
+
+ g_free(new_cache);
+ g_free(new_mark);
debug_print("done.\n");
+ END_TIMING();
return 0;
}
projects / claws.git / blobdiff