--- parser3/src/main/pa_common.C 2002/02/05 09:32:43 1.97 +++ parser3/src/main/pa_common.C 2002/02/08 08:32:34 1.102 @@ -1,10 +1,10 @@ /** @file Parser: commonly functions. - Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) + Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: pa_common.C,v 1.97 2002/02/05 09:32:43 paf Exp $ + $Id: pa_common.C,v 1.102 2002/02/08 08:32:34 paf Exp $ */ #include "pa_common.h" @@ -16,6 +16,10 @@ #include "pa_hash.h" #include "pa_string.h" +#ifdef WIN32 +# include +#endif + // some maybe-undefined constants #ifndef _O_TEXT @@ -30,67 +34,45 @@ // locking constants -#ifndef LOCK_EX -// win32 -# ifdef _LK_LOCK -# define LOCK_EX _LK_LOCK -# else -// sun -# ifdef F_LOCK -# define LOCK_EX F_LOCK -# else -# error unable to define LOCK_EX -# endif -# endif -#endif - -#ifndef LOCK_SH -// win32 -# ifdef _LK_RLCK -# define LOCK_SH _LK_RLCK -# else -// sun -/// @todo shared lock bit. forgot where to get those F_LOCK consts group -# ifdef F_LOCK -# define LOCK_SH F_LOCK -# else -# error unable to define LOCK_SH -# endif -# endif -#endif - -#ifndef LOCK_UN -// win32 -# ifdef _LK_UNLCK -# define LOCK_UN _LK_UNLCK -# else -// sun -# ifdef F_ULOCK -# define LOCK_UN F_ULOCK -# else -# error unable to define LOCK_UN -# endif -# endif -#endif +#ifdef HAVE_FLOCK + +static int lock_shared_blocking(int fd) { return flock(fd, LOCK_SH); } +static int lock_exclusive_blocking(int fd) { return flock(fd, LOCK_EX); } +static int lock_exclusive_nonblocking(int fd) { return flock(fd, LOCK_EX || LOCK_NB); } +static int unlock(int fd) { return flock(fd, LOCK_UN); } -#ifndef HAVE_FLOCK -// win32 +#else #ifdef HAVE__LOCKING -static void flock(int fd, int operation) { - lseek(fd, 0, SEEK_SET); - while(_locking(fd, operation, 1)!=0); - lseek(fd, 0, SEEK_SET); -} + +#define FLOCK(operation) lseek(fd, 0, SEEK_SET); return _locking(fd, operation, 1) +static int lock_shared_blocking(int fd) { FLOCK(_LK_LOCK); } +static int lock_exclusive_blocking(int fd) { FLOCK(_LK_LOCK); } +static int lock_exclusive_nonblocking(int fd) { FLOCK(_LK_NBLCK); } +static int unlock(int fd) { FLOCK(_LK_UNLCK); } + +#else +#ifdef HAVE_FCNTL + +#define FLOCK(cmd, arg) struct flock ls={arg, SEEK_SET}; return fcntl(fd, cmd, &ls) +static int lock_shared_blocking(int fd) { FLOCK(F_SETLKW, F_RDLCK); } +static int lock_exclusive_blocking(int fd) { FLOCK(F_SETLKW, F_WRLCK); } +static int lock_exclusive_nonblocking(int fd) { FLOCK(F_SETLK, F_RDLCK); } +static int unlock(int fd) { FLOCK(F_SETLK, F_UNLCK); } + #else -// sun #ifdef HAVE_LOCKF -static void flock(int fd, int operation) { - lseek(fd, 0, SEEK_SET); - lockf(fd, operation, 1); - lseek(fd, 0, SEEK_SET); -} + +#define FLOCK(fd, operation) lseek(fd, 0, SEEK_SET); return lockf(fd, operation, 1) +static int lock_shared_blocking(int fd) { FLOCK(F_LOCK); } // on intel solaris man doesn't have doc on shared blocking +static int lock_exclusive_blocking(int fd) { FLOCK(F_LOCK); } +static int lock_exclusive_nonblocking(int fd) { FLOCK(F_TLOCK); } +static int unlock(int fd) { FLOCK(F_TLOCK); } + #else -#error unable to find locking func + +#error unable to find file locking func + +#endif #endif #endif #endif @@ -150,37 +132,44 @@ bool file_read(Pool& pool, const String& // directory entry of b.html in NTFS not updated at once, // they delay update till open, so we would receive "!^test[" string // if would do stat, next open. - if( - (f=open(fname, O_RDONLY|(as_text?_O_TEXT:_O_BINARY)))>=0 && - stat(fname, &finfo)==0) { - flock(f, LOCK_SH); - size_t max_size=limit?min(offset+limit, finfo.st_size)-offset:finfo.st_size; - int read_size; + if((f=open(fname, O_RDONLY|(as_text?_O_TEXT:_O_BINARY)))>=0) { + lock_shared_blocking(f); + if(stat(fname, &finfo)!=0) { + Exception e(0, 0, + &file_spec, + "stat failed: %s (%d), actual filename '%s'", + strerror(errno), errno, fname); + unlock(f); + close(f); + if(fail_on_read_problem) + throw e; + return false; + } + size_t max_size=limit?min(offset+limit, (size_t)finfo.st_size)-offset:finfo.st_size; if(!max_size) { // eof if(as_text) { data=pool.malloc(1); *(char*)data=0; } else data=0; - read_size=0; + data_size=0; } else { data=pool.malloc(max_size+(as_text?1:0), 3); if(offset) lseek(f, offset, SEEK_SET); - read_size=read(f, data, max_size); + data_size=read(f, data, max_size); } - flock(f, LOCK_UN); + unlock(f); close(f); if(!max_size) // eof return true; - if(read_size<0 || size_t(read_size)>max_size) + if(int(data_size)<0 || data_size>max_size) throw Exception(0, 0, &file_spec, "read failed: actually read %d bytes count not in [0..%lu] valid range", - read_size, (unsigned long)max_size); //never + data_size, (unsigned long)max_size); //never - data_size=read_size; if(as_text) { fix_line_breaks((char *)data, data_size); // note: after fixing @@ -205,11 +194,12 @@ static void create_dir_for_file(const St } } -void file_action_under_lock( +bool file_write_action_under_lock( const String& file_spec, const char *action_name, void (*action)(int, void *), void *context, bool as_text, - bool do_append) { + bool do_append, + bool do_block) { const char *fname=file_spec.cstr(String::UL_FILE_SPEC); int f; if(access(fname, W_OK)!=0) // no @@ -218,19 +208,29 @@ void file_action_under_lock( if((f=open(fname, O_CREAT|O_RDWR |(as_text?_O_TEXT:_O_BINARY) - |(do_append?O_APPEND:O_TRUNC), 0664))>=0) { - flock(f, LOCK_EX); + |(do_append?O_APPEND:0), 0664))>=0) { + if((do_block?lock_exclusive_blocking(f):lock_exclusive_nonblocking(f))!=0) { + close(f); + return false; + } try { action(f, context); } catch(...) { - flock(f, LOCK_UN); +#if O_TRUNC==0 + ftruncate(f, tell(f)); +#endif + unlock(f); close(f); /*re*/throw; } - flock(f, LOCK_UN); +#if O_TRUNC==0 + ftruncate(f, tell(f)); +#endif + unlock(f); close(f); + return true; } else throw Exception(0, 0, &file_spec, @@ -248,9 +248,6 @@ static void file_write_action(int f, voi File_write_action_info& info=*static_cast(context); if(info.size) write(f, info.data, info.size); -#if O_TRUNC==0 - ftruncate(f, info.size); -#endif } void file_write( const String& file_spec, @@ -258,7 +255,7 @@ void file_write( bool as_text, bool do_append) { File_write_action_info info={data, size}; - file_action_under_lock( + file_write_action_under_lock( file_spec, "write", file_write_action, &info, as_text, @@ -619,3 +616,17 @@ int __snprintf(char *b, size_t s, const va_end(l); return r; } + +int pa_sleep(unsigned long secs, unsigned long usecs) { + for (; usecs >= 1000000; ++secs, usecs -= 1000000); + +#ifdef WIN32 + Sleep(secs * 1000 + usecs / 1000); + return 0; +#else + struct timeval t; + t.tv_sec = secs; + t.tv_usec = usecs; + return (select(0, NULL, NULL, NULL, &t) == -1 ? errno : 0); +#endif +}