Bug fixes in Core and Installers.

Author: francois333

core/network/locfile.c

@@ -87,9 +87,8 @@ inline int LocFileRead( LocFile* file, long long offset, long long size )
 	}
 
 	file->lf_FileSize = size;
-	FILE* fp = file->fp;
-	fseek( fp, offset, SEEK_SET );
-	int result = fread( file->lf_Buffer, 1, size, fp );
+	fseek( file->lf_Fp, offset, SEEK_SET );
+	int result = fread( file->lf_Buffer, 1, size, file->lf_Fp );
 	if( result < size )
 	{
 		return result; 
@@ -121,14 +120,14 @@ LocFile* LocFileNew( char* path, unsigned int flags )
 	struct stat st;
 	if( stat( path, &st ) < 0 )
 	{
-		FERROR( "Cannot stat file.\n" );
+		FERROR( "Cannot stat file: '%s'.\n", path );
 		fclose( fp );
 		return NULL;
 	}
 
 	if( S_ISDIR( st.st_mode ) )
 	{
-		FERROR( "Is a directory. Can not open.\n" );
+		FERROR( "'%s' is a directory. Can not open.\n", path );
 		fclose( fp );
 		return NULL;
 	}
@@ -145,10 +144,10 @@ LocFile* LocFileNew( char* path, unsigned int flags )
 
 		DEBUG("PATH: %s\n", fo->lf_Path );
 
-		memcpy(  &(fo->info),  &st, sizeof( struct stat) );
+		memcpy(  &(fo->lf_Info),  &st, sizeof( struct stat) );
 		//fstat( fp, &(fo->info));
 
-		fo->fp = fp;
+		fo->lf_Fp = fp;
 		//fseek( fp, 0L, SEEK_END );
 
 		fseek( fp, 0, SEEK_END );
@@ -228,10 +227,10 @@ int LocFileReload( LocFile *file,  char *path )
 	DEBUG("File %s will be reloaded\n", path );
 	//char *tmpPath = NULL;
 
-	if( file->fp )
+	if( file->lf_Fp )
 	{
-		fclose( file->fp );
-		file->fp = NULL;
+		fclose( file->lf_Fp );
+		file->lf_Fp = NULL;
 	}
 
 	//if( file->lf_Path )
@@ -258,9 +257,9 @@ int LocFileReload( LocFile *file,  char *path )
 		FERROR("Cannot run stat on file: %s!\n", path);
 		return -2;
 	}
-	memcpy(  &(file->info),  &st, sizeof(stat) );
+	memcpy(  &(file->lf_Info),  &st, sizeof(stat) );
 
-	file->fp = fp;
+	file->lf_Fp = fp;
 	fseek( fp, 0, SEEK_END );
 	long fsize = ftell( fp );
 	fseek( fp, 0, SEEK_SET );  //same as rewind(f);
@@ -287,10 +286,10 @@ void LocFileDelete( LocFile* file )
 	{
 		FFree( file->lf_Filename );
 	}
-	if( file->fp )
+	if( file->lf_Fp )
 	{
-		fclose( file->fp );
-		file->fp = NULL;
+		fclose( file->lf_Fp );
+		file->lf_Fp = NULL;
 	}
 	if( file->lf_Path )
 	{

core/network/locfile.h

@@ -54,9 +54,10 @@ typedef struct LocFile
 	char			*lf_Buffer;
 	unsigned long   lf_FileSize;
 
-	FILE*           fp;       // File pointer
-	int             fd;       // File descriptor
-	struct stat     info;
+	FILE*           lf_Fp;       // File pointer
+	int             lf_Fd;       // File descriptor
+	struct stat     lf_Info;
+	time_t			lf_ModificationTimestamp;
 
 	FUQUAD          lf_FileUsed;
 	struct MinNode  node;

core/network/protocol_http.c

@@ -187,7 +187,7 @@ inline int ReadServerFile( Uri *uri, char *locpath, BufString *dstbs, int *resul
 
 
 				//DEBUG1("\n\n\n\n\n SIZE %lld  stat %lld\n\n\n\n",attr.st_mtime ,file->info.st_mtime );
-				if( attr.st_mtime != file->info.st_mtime )
+				if( attr.st_mtime != file->lf_Info.st_mtime )
 				{
 					LocFileReload( file, completePath->raw);
 				}
@@ -1129,7 +1129,7 @@ extern inline Http *ProtocolHttp( Socket* sock, char* data, unsigned int length
 
 												//DEBUG1("\n\n\n\n\n SIZE %lld  stat %lld   NAME %s\n\n\n\n",attr.st_mtime ,file->info.st_mtime,completePath->raw );
 												Log( FLOG_DEBUG, "[ProtocolHttp] File will be reloaded\n");
-												if( attr.st_mtime != file->info.st_mtime )
+												if( attr.st_mtime != file->lf_Info.st_mtime )
 												{
 													LocFileReload( file, decoded );
 												}

core/system/cache/cache_manager.c

@@ -90,7 +90,6 @@ void CacheManagerDelete( CacheManager *cm )
 			FFree( cm->cm_CacheFileGroup );
 		}
 
-		CacheUserFilesDeleteAll( cm->cm_CacheUserFiles );
 		/*
 		LocFile *lf = cm->cm_LocFileCache;
 		while( lf != NULL )
@@ -208,42 +207,19 @@ int CacheManagerFilePut( CacheManager *cm, LocFile *lf )
 /**
  * function store LocFile inside cache (User cache)
  *
- * @param cm pointer to CacheManager which will store file
- * @param usr pointer to User structure
+ * @param locusr pointer to User structure
  * @param lf pointer to LocFile structure which will be stored in cache
  * @return 0 when success, otherwise error number
  */
-int CacheManagerUserFilePut( CacheManager *cm, void *usr, LocFile *lf )
+int CacheManagerUserFilePut( void *locusr, LocFile *lf )
 {
-	if( cm != NULL )
+	if( locusr != NULL )
 	{
 		// trying to find user assigned to CacheUserFiles, on the end we should assign cache to user
-		CacheUserFiles *cusf = cm->cm_CacheUserFiles;
-		while( cusf != NULL )
-		{
-			if( cusf->cuf_Usr == usr )
-			{
-				break;
-			}
-			cusf = (CacheUserFiles *)cusf->node.mln_Succ;
-		}
-		
-		// if CacheUserFiles exist, we are adding file to list
-		if( cusf != NULL )
-		{
-			CacheUserFilesAddFile( cusf, lf );
-		}
-		else
-		{
-			CacheUserFiles *newcuf = CacheUserFilesNew( usr );
-			if( newcuf != NULL )
-			{
-				newcuf->node.mln_Succ = (MinNode *)cm->cm_CacheUserFiles;
-				cm->cm_CacheUserFiles = newcuf;
-				
-				CacheUserFilesAddFile( newcuf, lf );
-			}
-		}
+		User *usr = (User *)locusr;
+
+		CacheUserFilesAddFile( &(usr->u_FileCache), lf );
+
 	}
 	return 0;
 }
@@ -252,25 +228,16 @@ int CacheManagerUserFilePut( CacheManager *cm, void *usr, LocFile *lf )
 /**
  * function get LocFile from cache (User cache)
  *
- * @param cm pointer to CacheManager where LocFile will be searched
- * @param usr pointer to User structure
+ * @param locusr pointer to User structure
  * @param path full path to file (include device name)
  * @return LocFile structure when success, otherwise NULL
  */
-LocFile *CacheManagerUserFileGet( CacheManager *cm, void *usr, char *path )
+LocFile *CacheManagerUserFileGet( void *locusr, char *path )
 {
-	if( cm != NULL )
+	if( locusr != NULL )
 	{
 		// trying to find user assigned to CacheUserFiles, on the end we should assign cache to user
-		CacheUserFiles *cusf = cm->cm_CacheUserFiles;
-		while( cusf != NULL )
-		{
-			if( cusf->cuf_Usr == usr )
-			{
-				break;
-			}
-			cusf = (CacheUserFiles *)cusf->node.mln_Succ;
-		}
+		User *usr = (User *)locusr;
 
 		uint64_t hash[ 2 ];
 		MURMURHASH3( path, strlen(path), hash );
@@ -279,18 +246,16 @@ LocFile *CacheManagerUserFileGet( CacheManager *cm, void *usr, char *path )
 		unsigned char id = (unsigned char)hfirstChar[0];
 
 		// if CacheUserFiles exist, we are trying to find file
-		if( cusf != NULL )
+
+		LocFile *lf = usr->u_FileCache->cuf_File;
+		while( lf != NULL )
 		{
-			LocFile *lf = cusf->cuf_File;
-			while( lf != NULL )
+			if( memcmp( hash, lf->hash, sizeof(hash) ) == 0 )
 			{
-				if( memcmp( hash, lf->hash, sizeof(hash) ) == 0 )
-				{
-					lf->lf_FileUsed++;
-					return lf;
-				}
-				lf = (LocFile *)lf->node.mln_Succ;
+				lf->lf_FileUsed++;
+				return lf;
 			}
+			lf = (LocFile *)lf->node.mln_Succ;
 		}
 	}
 	return 0;

core/system/cache/cache_manager.h

@@ -57,7 +57,6 @@ typedef struct CacheManager
 {
 	CacheFileGroup	*cm_CacheFileGroup;
 	LocFile			*cm_LocFileCache;
-	CacheUserFiles	*cm_CacheUserFiles;
 	FUQUAD			cm_CacheSize;
 	FUQUAD 			cm_CacheMax;
 }CacheManager;

core/system/fsys/fs_manager_web.c

@@ -33,6 +33,8 @@
 #include <util/md5.h>
 #include <system/fsys/door_notification.h>
 #include <stdlib.h>
+#include <system/cache/cache_user_files.h>
+#include <system/cache/cache_manager.h>
 
 /**
  * Filesystem web calls handler
@@ -697,6 +699,8 @@ Http *FSMWebRequest( void *m, char **urlpath, Http *request, UserSession *logged
 					FBOOL have = FSManagerCheckAccess( l->sl_FSM, path, actDev->f_ID, loggedSession->us_User, "-R----" );
 					if( have == TRUE )
 					{
+						LocFile *lf = CacheManagerUserFileGet( loggedSession->us_User, origDecodedPath );
+						
 						if( mode != NULL && strcmp( mode, "rs" ) == 0 )		// read stream
 						{ 
 							File *fp = (File *)actFS->FileOpen( actDev, path, mode );

core/system/fsys/fsys.c

@@ -91,7 +91,7 @@ FHandler *FHandlerCreate( const char *path, const char *name )
 			memcpy( fsys->Path, path, len );
 		}
 
-		if( ( fsys->handle = dlopen ( path, RTLD_LAZY ) ) != NULL )
+		if( ( fsys->handle = dlopen( path, RTLD_NOW|RTLD_GLOBAL ) ) != NULL )
 		{
 			DEBUG("SYSTEMLIB FSYSCREATE, getting pointer to libs\n");
 
@@ -125,6 +125,7 @@ FHandler *FHandlerCreate( const char *path, const char *name )
 			fsys->InfoSet = dlsym( fsys->handle, "InfoSet" );
 
 			fsys->Dir = dlsym( fsys->handle, "Dir");
+			fsys->GetChangeTimestamp = dlsym( fsys->handle, "GetChangeTimestamp" );
 
 			fsys->init( fsys );
 		}
@@ -151,7 +152,6 @@ void FHandlerDelete( FHandler *fsys )
 {
 	if( fsys != NULL )
 	{
-		DEBUG( "\t\t\t\tFSYS deinit %p", fsys->deinit );
 		fsys->deinit( fsys );
 
 		if( fsys->Name )
@@ -166,7 +166,7 @@ void FHandlerDelete( FHandler *fsys )
 
 		if( fsys->handle )
 		{
-			dlclose ( fsys->handle );
+			dlclose( fsys->handle );
 		}
 
 		FFree( fsys );

core/system/fsys/fsys.h

@@ -35,7 +35,6 @@
 #include <util/hooks.h>
 #include <util/hashmap.h>
 #include <util/tagitem.h>
-//#include <user/userlibrary.h>
 #include <util/base64.h>
 #include <util/buffered_string.h>
 #include <system/fsys/file.h>
@@ -88,19 +87,16 @@ typedef struct FHandler
 	char                    *(*GetSuffix)();
 	char                    *(*GetPrefix)();
 
-	// ONLY USED BY system.library
 	void                    *(*Mount)( struct FHandler *s, struct TagItem *ti, User *us );
 	int                     (*UnMount)( struct FHandler *s, void *f, User *usr );
 	int                     (*Release)( struct FHandler *s, void *f );
-	
-	//
+
 	void                    *(*FileOpen)( struct File *s, const char *path, char *mode );
 	int                     (*FileClose)( struct File *s, void *fp );
 	int                     (*FileRead)( struct File *s, char *buf, int size );
 	int                     (*FileWrite)( struct File *s, char *buf, int size );
 	int                     (*FileSeek)( struct File *s, int pos );
 
-	// mount / unmount will be system.library function, will return pointer to root file
 	int                     (*MakeDir)( struct File *s, const char *path );
 	int                     (*Delete)( struct File *s, const char *path );
 	int                     (*Rename)( struct File *s, const char *path, const char *nname );
@@ -113,6 +109,7 @@ typedef struct FHandler
 	BufString               *(*Info)( struct File *s, const char *path );
 	BufString               *(*Call)( struct File *s, const char *path, char *args );
 	BufString               *(*Dir)( struct File *s, const char *path );
+	FQUAD					(*GetChangeTimestamp)( struct File *s, const char *path );
 
 	void                     *fh_SpecialData;
 }FHandler;

core/system/fsysdyn/fsysinram.c

@@ -110,7 +110,7 @@ char *GetFileName( const char *path )
 
 void init( struct FHandler *s )
 {
-	//s->Info = dlsym( s->handle, "Info" );
+	DEBUG("[RAMFS] init\n");
 }
 
 //
@@ -119,7 +119,7 @@ void init( struct FHandler *s )
 
 void deinit( struct FHandler *s )
 {
-	
+	DEBUG("[RAMFS] deinit\n");
 }
 
 //
@@ -164,8 +164,6 @@ void *Mount( struct FHandler *s, struct TagItem *ti, User *usr )
 			lptr++;
 		}
 
-		init( s );
-		
 		SpecialData *srd =  calloc( 1, sizeof( SpecialData ) );
 		srd->root = INRAMFileNew( INRAM_ROOT, name, name );
 		dev->f_SpecialData = srd;
@@ -648,6 +646,15 @@ void FillStat( BufString *bs, INRAMFile *nf, File *d, const char *path )
 	//DEBUG( "FILLSTAT END\n");
 }
 
+//
+// Get information about last file changes (seconds from 1970)
+//
+
+FQUAD GetChangeTimestamp( struct File *s, const char *path )
+{
+	return (FQUAD)0;
+}
+
 //
 // Get info about file/folder and return as "string"
 //