noffle: src/fetch.c comparison

comparison src/fetch.c @ 127:3c71e28c8eef noffle

[svn] Release-1-0 mergedocs/NOTES

author	bears
date	Tue, 25 Jul 2000 13:14:54 +0100
parents	05f50c1761d9
children	6b2b93288caa

comparison

equal deleted inserted replaced

-:7c7a7c96d35b
+:3c71e28c8eef
 /*
 fetch.c
-$Id: fetch.c 174 2000-07-19 07:02:45Z enz $
+$Id: fetch.c 183 2000-07-25 12:14:54Z bears $
 */
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include "content.h"
 #include "dynamicstring.h"
 #include "fetchlist.h"
 #include "request.h"
 #include "group.h"
+#include "lock.h"
 #include "log.h"
 #include "outgoing.h"
 #include "protocol.h"
 #include "pseudo.h"
 #include "util.h"
 #include "portable.h"
+#define	MAX_ARTICLE_CMDS_QUEUED		20
 struct Fetch
 {
 Bool ready;
 Str serv;
 } fetch = { FALSE, "" };
 {
 time_t t;
 Str file;
 ASSERT( fetch.ready );
-snprintf( file, MAXCHAR, "%s/groupinfo.lastupdate", Cfg_spoolDir() );
+snprintf( file, MAXCHAR, "%s/lastupdate.%s",
+	      Cfg_spoolDir(), fetch.serv );
 if ( ! Utl_getStamp( &t, file ) )
 {
 Log_err( "Cannot read %s. Please run noffle --query groups", file );
 return;
 }
 Log_inf( "Updating groupinfo" );
 Client_getNewgrps( &t );
-Utl_stamp( file );
+}
-}
+/* Databases open on entry, closed on exit. */
-void
+static void
-Fetch_getNewArts( const char *name, FetchMode mode )
+fetchNewArts( const char *name, FetchMode mode )
 {
 int next, first, last;
 if ( ! Client_changeToGrp( name ) )
 {
 Log_err( "Could not change to group %s", name );
-return;
+	Lock_closeDatabases();
-}
+return;
+}
+Client_rmtFirstLast( &first, &last );
 Cont_read( name );
-Client_rmtFirstLast( &first, &last );
 next = Grp_rmtNext( name );
 if ( next == GRP_RMT_NEXT_NOT_SUBSCRIBED )
 	next = first;
 if ( next == last + 1 )
 {
 Log_inf( "No new articles in %s", name );
 Cont_write();
 Grp_setFirstLast( name, Cont_first(), Cont_last() );
+	Lock_closeDatabases();
 return;
 }
 if ( first == 0 && last == 0 )
 {
 Log_inf( "No articles in %s", name );
 Cont_write();
 Grp_setFirstLast( name, Cont_first(), Cont_last() );
+	Lock_closeDatabases();
 return;
 }
 if ( next > last + 1 )
 {
 Log_err( "Article number inconsistent (%s rmt=%lu-%lu, next=%lu)",
 Log_ntc( "Cutting number of overviews to %lu", Cfg_maxFetch() );
 first = last - Cfg_maxFetch() + 1;
 }
 Log_inf( "Getting remote overviews %lu-%lu for group %s",
 first, last, name );
-Client_getOver( first, last, mode );
+Lock_closeDatabases();
-Cont_write();
+Client_getOver( name, first, last, mode );
-Grp_setFirstLast( name, Cont_first(), Cont_last() );
+}
+void
+Fetch_getNewArts( const char *name, FetchMode mode )
+{
+if ( ! Lock_openDatabases() )
+{
+Log_err( "Could not open message base" );
+return;
+}
+fetchNewArts( name, mode );
 }
 void
 Fetch_updateGrps( void )
 {
 FetchMode mode;
 int i, size;
-const char* name;
+const char *name;
 ASSERT( fetch.ready );
+if ( ! Lock_openDatabases() )
+{
+Log_err( "Could not open message base" );
+return;
+}
 Fetchlist_read();
 size = Fetchlist_size();
 for ( i = 0; i < size; ++i )
 {
 Fetchlist_element( &name, &mode, i );
 if ( strcmp( Grp_server( name ), fetch.serv ) == 0 )
-Fetch_getNewArts( name, mode );
+	{
-}
+fetchNewArts( name, mode );
+	    if ( ! Lock_openDatabases() )
+	    {
+		Log_err( "Could not open message base" );
+		return;
+	    }
+	}
+}
+Lock_closeDatabases();
+}
+static void
+fetchMessageList( const char *list, int *artcnt, int artmax )
+{
+const char *p;
+Str msgId;
+ASSERT( Lock_gotLock() );
+Client_retrieveArtList( list, artcnt, artmax );
+p = list;
+while ( ( p = Utl_getLn( msgId, p ) ) )
+Req_remove( fetch.serv, msgId );
 }
 void
 Fetch_getReq_( void )
 {
 Str msgId;
 DynStr *list;
+DynStr *fetchList;
 const char *p;
 int count = 0, artcnt = 0, artmax = 0;
 ASSERT( fetch.ready );
 Log_dbg( "Retrieving articles marked for download" );
 list = new_DynStr( 10000 );
-if ( Req_first( fetch.serv, msgId ) ) do { artmax++; } while ( Req_next( msgId ) );
+fetchList = new_DynStr( 1000 );
-Log_inf( "%d TOTAL messages to download", artmax);
+if ( list == NULL || fetchList == NULL )
+{
+	if ( list != NULL )
+	    del_DynStr( list );
+Log_err( "Out of memory in Fetch_get_Req_");
+	return;
+}
+/*
+* Get all waiting message IDs for this server. We copy into a master
+* list as the requests file will be closed and re-opened during the
+* fetch and the position therein will be lost.
+*/
+if ( ! Lock_openDatabases() )
+{
+Log_err( "Could not open message base" );
+return;
+}
 if ( Req_first( fetch.serv, msgId ) )
+{
 do
 {
 DynStr_appLn( list, msgId );
-if ( ++count % 20 == 0 ) /* Send max. 20 ARTICLE cmds at once */
+	    artmax++;
-{
-p = DynStr_str( list );
-Client_retrieveArtList( p, &artcnt, artmax );
-while ( ( p = Utl_getLn( msgId, p ) ) )
-Req_remove( fetch.serv, msgId );
-DynStr_clear( list );
-}
 }
 while ( Req_next( msgId ) );
+	Log_inf( "%d TOTAL messages to download", artmax);
+}
+/* Retrieve in groups of up to size MAX_ARTICLE_CMDS_QUEUED. */
 p = DynStr_str( list );
-Client_retrieveArtList( p, &artcnt, artmax );
+while ( ( p = Utl_getLn( msgId, p ) ) != NULL )
-while ( ( p = Utl_getLn( msgId, p ) ) )
+{
-Req_remove( fetch.serv, msgId );
+	DynStr_appLn( fetchList, msgId );
+	if ( ++count % MAX_ARTICLE_CMDS_QUEUED == 0 )
+	{
+	    fetchMessageList( DynStr_str( fetchList ), &artcnt, artmax );
+	    DynStr_clear( fetchList );
+	}
+}
+fetchMessageList( DynStr_str( fetchList ), &artcnt, artmax );
+del_DynStr( fetchList );
 del_DynStr( list );
+Lock_closeDatabases();
 }
 static void
 returnArticleToSender( const char *sender, const char *reason,
 const char *article )
 }
 Bool
 Fetch_init( const char *serv )
 {
+Lock_closeDatabases();
 if ( ! connectToServ( serv ) )
 return FALSE;
 Utl_cpyStr( fetch.serv, serv );
 fetch.ready = TRUE;
 return TRUE;
 Fetch_close()
 {
 Client_disconnect();
 fetch.ready = FALSE;
 Log_inf( "Fetch from '%s' finished", fetch.serv );
-}
+Lock_openDatabases();
+}

Mercurial > noffle

comparison src/fetch.c @ 127:3c71e28c8eef noffle