2007-12-20 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #362638 * calendar/gui/alarm-notify/alarm-notify.c: * calendar/gui/alarm-notify/alarm-notify.h: * calendar/gui/alarm-notify/alarm-queue.c: Rewrite message passing to use GThreadPool instead of EThread. * mail/mail-mt.h: Overhaul the message passing API: - Define a MailMsg type as the base message struct. - Define types for the various callback functions. - Add a priority value to each message (not yet used). - Add a reference count to each message. - Define a MailMsgInfo type for the virtual function table. - Record the size of message sub-types in MailMsgInfo. - New/changed functions: mail_msg_new() - Easier to use. mail_msg_ref() - Increase reference count. mail_msg_unref() - Decrease reference count. mail_msg_main_loop_push() } mail_msg_unordered_push() } Submit MailMsgs to various mail_msg_fast_ordered_push() } message-processing threads. mail_msg_slow_ordered_push() } * mail/mail-mt.c (mail_msg_new): Use GSlice for memory allocation. * mail/mail-mt.c (mail_msg_ref), (mail_msg_unref): New functions increment/decrement a MailMsg's reference count. * mail/mail-mt.c (mail_cancel_hood_add), (mail_cancel_hook_remove): Convert the 'cancel_hook_list' from an EDList to a GHookList and modify the API accordingly. * mail/mail-mt.c: Use GThreadPools instead of EThreads. Use GAsyncQueues instead of EMsgPorts. * mail/em-composer-utils.c: * mail/em-folder-browser.c: * mail/em-folder-properties.c: * mail/em-folder-tree.c: * mail/em-folder-utils.c: * mail/em-folder-view.c: * mail/em-format-html-print.c: * mail/em-format-html.c: * mail/em-subscribe-editor.c: * mail/em-sync-stream.c: * mail/importers/elm-importer.c: * mail/importers/mail-importer.c: * mail/importers/pine-importer.c: * mail/mail-component.c: * mail/mail-folder-cache.c: * mail/mail-mt.c: * mail/mail-ops.c: * mail/mail-ops.h: * mail/mail-send-recv.c: * mail/mail-session.c: * mail/mail-vfolder.c: * mail/message-list.c: * plugins/folder-unsubscribe/folder-unsubscribe.c: * plugins/groupwise-features/share-folder-common.c: * plugins/exchange-operations/exchange-folder.c: * plugins/mark-all-read/mark-all-read.c: * plugins/mailing-list-actions/mailing-list-actions.c: * plugins/itip-formatter/itip-formatter.c: * plugins/save-attachments/save-attachments.c: Use the new MailMsg API for messages. svn path=/trunk/; revision=34730
211 lines
4.6 KiB
C
211 lines
4.6 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
|
|
/*
|
|
* Authors: Jeffrey Stedfast <fejj@ximian.com>
|
|
* Michael Zucchi <notzed@ximian.com>
|
|
*
|
|
* Copyright 2001 Ximian, Inc. (www.ximian.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of version 2 of the GNU General Public
|
|
* License as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* 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., 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301, USA.
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
|
|
#include "em-sync-stream.h"
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <camel/camel-object.h>
|
|
#include <libedataserver/e-flag.h>
|
|
|
|
#include "mail-mt.h"
|
|
|
|
#define EMSS_CLASS(x) ((EMSyncStreamClass *)(((CamelObject *)(x))->klass))
|
|
|
|
enum _write_msg_t {
|
|
EMSS_WRITE,
|
|
EMSS_FLUSH,
|
|
EMSS_CLOSE,
|
|
};
|
|
|
|
struct _write_msg {
|
|
EMSyncStream *emss;
|
|
EFlag *done;
|
|
|
|
enum _write_msg_t op;
|
|
|
|
const gchar *string;
|
|
gsize len;
|
|
};
|
|
|
|
static CamelStreamClass *parent_class = NULL;
|
|
|
|
static gboolean
|
|
emss_process_message (struct _write_msg *msg)
|
|
{
|
|
struct _EMSyncStream *emss = msg->emss;
|
|
|
|
/* Force out any pending data before doing anything else. */
|
|
if (emss->buffer != NULL && emss->buffer->len > 0) {
|
|
EMSS_CLASS (emss)->sync_write (
|
|
CAMEL_STREAM (emss), emss->buffer->str,
|
|
emss->buffer->len);
|
|
g_string_set_size (emss->buffer, 0);
|
|
}
|
|
|
|
switch (msg->op) {
|
|
case EMSS_WRITE:
|
|
EMSS_CLASS (emss)->sync_write (
|
|
CAMEL_STREAM (emss), msg->string, msg->len);
|
|
break;
|
|
case EMSS_FLUSH:
|
|
EMSS_CLASS (emss)->sync_flush (
|
|
CAMEL_STREAM (emss));
|
|
break;
|
|
case EMSS_CLOSE:
|
|
EMSS_CLASS (emss)->sync_close (
|
|
CAMEL_STREAM (emss));
|
|
break;
|
|
}
|
|
|
|
e_flag_set (msg->done);
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static void
|
|
emss_sync_op (EMSyncStream *emss, enum _write_msg_t op,
|
|
const gchar *string, gsize len)
|
|
{
|
|
struct _write_msg msg;
|
|
|
|
msg.done = e_flag_new ();
|
|
msg.emss = emss;
|
|
msg.op = op;
|
|
msg.string = string;
|
|
msg.len = len;
|
|
|
|
camel_object_ref (emss);
|
|
|
|
g_idle_add ((GSourceFunc) emss_process_message, &msg);
|
|
|
|
e_flag_wait (msg.done);
|
|
e_flag_free (msg.done);
|
|
|
|
camel_object_unref (emss);
|
|
}
|
|
|
|
static gssize
|
|
emss_stream_write (CamelStream *stream, const gchar *string, gsize len)
|
|
{
|
|
EMSyncStream *emss = EM_SYNC_STREAM (stream);
|
|
|
|
if (emss->cancel)
|
|
return -1;
|
|
|
|
if (mail_in_main_thread ()) {
|
|
EMSS_CLASS (emss)->sync_write (stream, string, len);
|
|
} else if (emss->buffer != NULL) {
|
|
if (len < (emss->buffer->allocated_len - emss->buffer->len))
|
|
g_string_append_len (emss->buffer, string, len);
|
|
else
|
|
emss_sync_op (emss, EMSS_WRITE, string, len);
|
|
} else {
|
|
emss_sync_op(emss, EMSS_WRITE, string, len);
|
|
}
|
|
|
|
return (gssize) len;
|
|
}
|
|
|
|
static int
|
|
emss_stream_flush (CamelStream *stream)
|
|
{
|
|
EMSyncStream *emss = EM_SYNC_STREAM (stream);
|
|
|
|
if (emss->cancel)
|
|
return -1;
|
|
|
|
if (mail_in_main_thread ())
|
|
return EMSS_CLASS (emss)->sync_flush (stream);
|
|
else
|
|
emss_sync_op (emss, EMSS_FLUSH, NULL, 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
emss_stream_close (CamelStream *stream)
|
|
{
|
|
EMSyncStream *emss = EM_SYNC_STREAM (stream);
|
|
|
|
if (emss->cancel)
|
|
return -1;
|
|
|
|
if (mail_in_main_thread ())
|
|
return EMSS_CLASS (emss)->sync_close (stream);
|
|
else
|
|
emss_sync_op (emss, EMSS_CLOSE, NULL, 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void
|
|
em_sync_stream_class_init (EMSyncStreamClass *class)
|
|
{
|
|
CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (class);
|
|
|
|
parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE;
|
|
|
|
stream_class->write = emss_stream_write;
|
|
stream_class->flush = emss_stream_flush;
|
|
stream_class->close = emss_stream_close;
|
|
}
|
|
|
|
static void
|
|
em_sync_stream_finalize (EMSyncStream *emss)
|
|
{
|
|
if (emss->buffer != NULL)
|
|
g_string_free (emss->buffer, TRUE);
|
|
}
|
|
|
|
CamelType
|
|
em_sync_stream_get_type (void)
|
|
{
|
|
static CamelType type = CAMEL_INVALID_TYPE;
|
|
|
|
if (G_UNLIKELY (type == CAMEL_INVALID_TYPE))
|
|
type = camel_type_register (
|
|
CAMEL_STREAM_TYPE,
|
|
"EMSyncStream",
|
|
sizeof (EMSyncStream),
|
|
sizeof (EMSyncStreamClass),
|
|
(CamelObjectClassInitFunc) em_sync_stream_class_init,
|
|
NULL,
|
|
(CamelObjectInitFunc) NULL,
|
|
(CamelObjectFinalizeFunc) em_sync_stream_finalize);
|
|
|
|
return type;
|
|
}
|
|
|
|
void
|
|
em_sync_stream_set_buffer_size (EMSyncStream *emss, gsize size)
|
|
{
|
|
if (emss->buffer != NULL)
|
|
g_string_free (emss->buffer, TRUE);
|
|
emss->buffer = g_string_sized_new (size);
|
|
}
|