Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When RDF wants to call NET_GetURL(), if its not running on the mozilla_thread, post an event instead of calling NET_GetURL() directly.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@11823 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rjc%netscape.com 1998-10-03 00:02:25 +00:00
parent 71b0a31a59
commit 891b5bea1c
2 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mozilla/modules/rdf/src/glue.c
View File

@ -45,6 +45,9 @@ extern MWContext *FE_GetRDFContext(void);
extern char *gDefaultNavcntr;
extern RDF gNCDB;
/* pointer to the mocha thread */
extern PRThread *mozilla_thread;
/* globals */
char *profileDirURL = NULL;
@ -249,11 +252,34 @@ rdfRetrievalType (RDFFile f)
*/
typedef struct {
ETEvent ce;
URL_Struct *urls;
int method;
MWContext *cx;
Net_GetUrlExitFunc *exitFunc;
} MozillaEvent_rdf_GetURL;
PR_STATIC_CALLBACK(void *)
rdf_HandleEvent_GetURL(MozillaEvent_rdf_GetURL *event)
{
NET_GetURL(event->urls, event->method, event->cx, event->exitFunc);
return(NULL);
}
PR_STATIC_CALLBACK(void)
rdf_DisposeEvent_GetURL(MozillaEvent_rdf_GetURL *event)
{
XP_FREE(event);
}
int
rdf_GetURL (MWContext *cx, int method, Net_GetUrlExitFunc *exit_routine, RDFFile rdfFile)
{
URL_Struct *urls = NULL;
char* url ;
MozillaEvent_rdf_GetURL *event;
URL_Struct *urls = NULL;
char *url;
#ifdef DEBUG_gagan
return 0;
#endif
@ -282,7 +308,27 @@ rdf_GetURL (MWContext *cx, int method, Net_GetUrlExitFunc *exit_routine, RDFFil
if (urls == NULL) return 0;
urls->fe_data = rdfFile;
if (method) urls->method = method;
NET_GetURL(urls, FO_CACHE_AND_RDF, cx, rdf_GetUrlExitFunc);
if (PR_CurrentThread() == mozilla_thread)
{
NET_GetURL(urls, FO_CACHE_AND_RDF, cx, rdf_GetUrlExitFunc);
}
else
{
/* send event to Mozilla thread */
if (mozilla_event_queue == NULL) return(0);
event = PR_NEW(MozillaEvent_rdf_GetURL);
if (event == NULL) return(0);
PR_InitEvent(&(event->ce.event), cx,
(PRHandleEventProc)rdf_HandleEvent_GetURL,
(PRDestroyEventProc)rdf_DisposeEvent_GetURL);
event->urls = urls;
event->method = FO_CACHE_AND_RDF;
event->cx = cx;
event->exitFunc = rdf_GetUrlExitFunc;
PR_PostEvent(mozilla_event_queue, &(event->ce.event));
}
return 1;
}
#endif /* MOZILLA_CLIENT */

2
mozilla/modules/rdf/src/glue.h
View File

@ -27,6 +27,8 @@
#include "fe_proto.h"
#include "prinit.h"
#include "prthread.h"
#include "libevent.h"
#ifdef XP_UNIX
#include <sys/fcntl.h>