Index: ChangeLog =================================================================== RCS file: /cvs/gnome/evolution/camel/ChangeLog,v retrieving revision 1.684 diff -r1.684 ChangeLog 0a1,34 > 2001-01-17 Not Zed <NotZed@Ximian.com> > > * camel-folder.c (free_summary): Call > camel_folder_summary_array_free() to do the work. > (get_summary): Use camel_folder_summary_array() to get the array > atomically. These fixes allow folder/test8 to work again, and fix > a sort of race where the summary size can change while we were > making a copy of it. > > * camel-folder-summary.c (camel_folder_summary_array): Get the > summary array atomically, so it can't contain empty records. > (camel_folder_summary_array_free): And free it. > > * tests/lib/camel-test.c (die): If we are verbose & in threads, > then goto sleep so we can debug. > > * tests/folder/test8.c (worker): Add a missing pull() for > comnparing content. > > * camel-filter-search.c: Fix the symbol table, so match-all is an > immediate function, as it should be. > > * tests/folder/test9.c (main): New test, tests some filtering > things. > > * tests/message/test3.c (main): Dont use a boundary string with > spaces in it. Folding can corrupt it. Maybe the folding isn't > working entirely right, but anyway. > > * camel-session.c: Debug out the debug. > > * camel-filter-driver.c (camel_filter_driver_filter_folder): Plug > a messageinfo leak. > 1a36,94 > > * camel-filter-search.c (header_exists): Changed to support > multiple args (or'd together). > (header_contains): Cleaned up to match the search code. Why did > fejj change it? I'll never know. > (header_matches): > (header_starts_with): > (header_ends_with): Big cleanup of fejj's "i'm the cut & paste > king" code. Also properly handle or'ing of additional args to > match what the folder-search code should do. > (check_match): New function which does the annoying matching > stuff (for header matches). > (check_header): Similarly, handles or'ing of the matches together. > (header_contains): > (header_matches): > (header_starts_with): > (header_ends_with): Call check_header to do the actual work. > (header_soundex): And here too. > (match_all): Yeah like match-all isn't passed expression results, > its passed expression terms. Fix this so match-all works like it > should, by executing the contained expression. > (message_body_contains): Copied directly from > camel-folder-search.c, a more robust/faster/simpler body search > code. > (mime_part_matches): Removed entirely. > (handle_multipart): Removed entirely. > (build_match_regex): Copied from camel-folder-search. Builds a > set of simple strings into a regex pattern that matches any of > them (for faster & simpler matching). Expanded to accept regex > patterns itself, so it can merge them together. > (body_contains): Use build match/match message to match using a > built regex. > (body_regex): Likewise, this time we tell it we're building a > regex though. > (header_full_regex): Use build_match_regex to take the drudgery > out of it, and expand it to handle multiple regex's at once. > (get_full_header): slightly cleaner (well i dunno, the sprintf > stuff just got to me). > (header_regex): Cleaned up to use build_match_Regex too, and to > properly check types. > (filter_message_search): Just allocate 'fms' on the stack. > > * camel-filter-driver.c (camel_filter_driver_finalise): > (camel_filter_driver_init): > (camel_filter_driver_class_init): > (camel_filter_driver_get_type): Changed from gtk object to camel > object. > (camel_filter_driver_add_rule): New function to add a rule to be > processed in sexp form. > (camel_filter_driver_init): Init the rules list. > (camel_filter_driver_finalise): Clear the rules/rules list. > (camel_filter_driver_filter_message): Scan rules list directly > rather than creating on the fly. > > * Makefile.am (libcamelinclude_HEADERS): Added camel-filter-driver.h > (libcamel_la_SOURCES): Added camel-filter-driver.c, code taken > from filter-driver, which can drive, uh, filters based on sexp's. > (libcamelinclude_HEADERS): > (libcamel_la_SOURCES): Added camel-filter-search.[ch] svn path=/trunk/; revision=7560
224 lines
5.7 KiB
C
224 lines
5.7 KiB
C
/* threaded folder testing */
|
|
|
|
#include "camel-test.h"
|
|
#include "folders.h"
|
|
#include "messages.h"
|
|
|
|
#include <camel/camel-exception.h>
|
|
#include <camel/camel-service.h>
|
|
#include <camel/camel-session.h>
|
|
#include <camel/camel-store.h>
|
|
|
|
#define MAX_MESSAGES (100)
|
|
#define MAX_THREADS (10)
|
|
|
|
#define d(x)
|
|
|
|
#ifndef ENABLE_THREADS
|
|
int main(int argc, char **argv)
|
|
{
|
|
printf("Test %s is only compiled with threads enabled\n", argv[0]);
|
|
return 77;
|
|
}
|
|
#else
|
|
|
|
#include <pthread.h>
|
|
|
|
/* god, who designed this horrid interface */
|
|
static char *auth_callback(CamelAuthCallbackMode mode,
|
|
char *data, gboolean secret,
|
|
CamelService *service, char *item,
|
|
CamelException *ex)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))
|
|
|
|
static char *local_providers[] = {
|
|
"mbox",
|
|
"mh",
|
|
"maildir"
|
|
};
|
|
|
|
static void
|
|
test_add_message(CamelFolder *folder, int j)
|
|
{
|
|
CamelMimeMessage *msg;
|
|
char *content;
|
|
char *subject;
|
|
CamelException ex;
|
|
|
|
camel_exception_init(&ex);
|
|
|
|
push("creating message %d\n", j);
|
|
msg = test_message_create_simple();
|
|
content = g_strdup_printf("Test message %d contents\n\n", j);
|
|
test_message_set_content_simple((CamelMimePart *)msg, 0, "text/plain",
|
|
content, strlen(content));
|
|
test_free(content);
|
|
subject = g_strdup_printf("Test message %d subject", j);
|
|
camel_mime_message_set_subject(msg, subject);
|
|
pull();
|
|
|
|
push("appending simple message %d", j);
|
|
camel_folder_append_message(folder, msg, NULL, &ex);
|
|
check_msg(!camel_exception_is_set(&ex), "%s", camel_exception_get_description(&ex));
|
|
pull();
|
|
|
|
check_unref(msg, 1);
|
|
}
|
|
|
|
struct _threadinfo {
|
|
int id;
|
|
CamelFolder *folder;
|
|
};
|
|
|
|
static void *
|
|
worker(void *d)
|
|
{
|
|
struct _threadinfo *info = d;
|
|
int i, j, id = info->id;
|
|
char *sub, *content;
|
|
GPtrArray *res;
|
|
CamelException *ex = camel_exception_new();
|
|
CamelMimeMessage *msg;
|
|
|
|
/* we add a message, search for it, twiddle some flags, delete it */
|
|
/* and flat out */
|
|
for (i=0;i<MAX_MESSAGES;i++) {
|
|
d(printf("Thread %ld message %i\n", pthread_self(), i));
|
|
test_add_message(info->folder, id+i);
|
|
|
|
sub = g_strdup_printf("(match-all (header-contains \"subject\" \"message %d subject\"))", id+i);
|
|
|
|
push("searching for message %d\n\tusing: %s", id+i, sub);
|
|
res = camel_folder_search_by_expression(info->folder, sub, ex);
|
|
check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
|
|
check_msg(res->len == 1, "res->len = %d", res->len);
|
|
pull();
|
|
|
|
push("getting message '%s'", res->pdata[0]);
|
|
msg = camel_folder_get_message(info->folder, (char *)res->pdata[0], ex);
|
|
check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
|
|
pull();
|
|
|
|
push("comparing content");
|
|
content = g_strdup_printf("Test message %d contents\n\n", id+i);
|
|
test_message_compare_content(camel_medium_get_content_object((CamelMedium *)msg), content, strlen(content));
|
|
test_free(content);
|
|
pull();
|
|
|
|
push("deleting message, cleanup");
|
|
j=(100.0*rand()/(RAND_MAX+1.0));
|
|
if (j<=70) {
|
|
camel_folder_delete_message(info->folder, res->pdata[0]);
|
|
}
|
|
|
|
camel_folder_search_free(info->folder, res);
|
|
res = NULL;
|
|
test_free(sub);
|
|
|
|
check_unref(msg, 1);
|
|
pull();
|
|
|
|
/* about 1-in 100 calls will expunge */
|
|
j=(200.0*rand()/(RAND_MAX+1.0));
|
|
if (j<=2) {
|
|
d(printf("Forcing an expuge\n"));
|
|
push("expunging folder");
|
|
camel_folder_expunge(info->folder, ex);
|
|
check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
|
|
pull();
|
|
}
|
|
}
|
|
|
|
camel_exception_free(ex);
|
|
|
|
return info;
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
CamelSession *session;
|
|
CamelException *ex;
|
|
int i, j, index;
|
|
char *path;
|
|
CamelStore *store;
|
|
pthread_t threads[MAX_THREADS];
|
|
struct _threadinfo *info;
|
|
CamelFolder *folder;
|
|
GPtrArray *uids;
|
|
|
|
camel_test_init(argc, argv);
|
|
|
|
ex = camel_exception_new();
|
|
|
|
/* clear out any camel-test data */
|
|
system("/bin/rm -rf /tmp/camel-test");
|
|
|
|
session = camel_session_new("/tmp/camel-test", auth_callback, NULL, NULL);
|
|
|
|
for (j=0;j<ARRAY_LEN(local_providers);j++) {
|
|
for (index=0;index<2;index++) {
|
|
path = g_strdup_printf("method %s %s", local_providers[j], index?"indexed":"nonindexed");
|
|
camel_test_start(path);
|
|
test_free(path);
|
|
|
|
push("trying %s index %d", local_providers[j], index);
|
|
path = g_strdup_printf("%s:///tmp/camel-test/%s", local_providers[j], local_providers[j]);
|
|
store = camel_session_get_store(session, path, ex);
|
|
check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
|
|
test_free(path);
|
|
|
|
if (index == 0)
|
|
folder = camel_store_get_folder(store, "testbox", CAMEL_STORE_FOLDER_CREATE, ex);
|
|
else
|
|
folder = camel_store_get_folder(store, "testbox",
|
|
CAMEL_STORE_FOLDER_CREATE|CAMEL_STORE_FOLDER_BODY_INDEX, ex);
|
|
check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
|
|
|
|
for (i=0;i<MAX_THREADS;i++) {
|
|
info = g_malloc(sizeof(*info));
|
|
info->id = i*MAX_MESSAGES;
|
|
info->folder = folder;
|
|
pthread_create(&threads[i], 0, worker, info);
|
|
}
|
|
|
|
for (i=0;i<MAX_THREADS;i++) {
|
|
pthread_join(threads[i], (void **)&info);
|
|
g_free(info);
|
|
}
|
|
pull();
|
|
|
|
push("deleting remaining messages");
|
|
uids = camel_folder_get_uids(folder);
|
|
for (i=0;i<uids->len;i++) {
|
|
camel_folder_delete_message(folder, uids->pdata[i]);
|
|
}
|
|
camel_folder_free_uids(folder, uids);
|
|
|
|
camel_folder_expunge(folder, ex);
|
|
check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
|
|
|
|
check_unref(folder, 1);
|
|
|
|
camel_store_delete_folder(store, "testbox", ex);
|
|
check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));
|
|
|
|
check_unref(store, 1);
|
|
|
|
pull();
|
|
|
|
camel_test_end();
|
|
}
|
|
}
|
|
|
|
camel_object_unref((CamelObject *)session);
|
|
camel_exception_free(ex);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#endif /* ENABLE_THREADS */
|