* errno.cc (errmap): Handle ERROR_IO_PENDING.
* fhandler.cc (fhandler_base::open): Make tape I/O asynchronous. * fhandler.h (class fhandler_dev_tape): Add mt_evt member. * fhandler_tape.cc (mtinfo_drive::initialize): Initialize async_writes. (mtinfo_drive::close): Handle async writes. (mtinfo_drive::read): Add mt_evt parameter. Use overlapped I/O. (mtinfo_drive::async_wait): New function. (mtinfo_drive::write): Add mt_evt parameter. Use overlapped I/O. Handle async writes. (mtinfo_drive::_set_pos): Handle async writes. (mtinfo_drive::set_partition): Ditto. (mtinfo_drive::prepare): Ditto. (mtinfo_drive::get_status): Drop useless "else". Handle async_writes flag. (mtinfo_drive::set_options): Handle async_writes flags. (fhandler_dev_tape::close): Close mt_evt handle. (fhandler_dev_tape::raw_read): Create mt_evt handle and use in call to mtinfo_drive::read. (fhandler_dev_tape::raw_write): Create mt_evt handle and use in call to mtinfo_drive::write. * mtinfo.h (MTINFO_VERSION): Bump. (enum dirty_state): Add async_write_pending state. (class mtinfo_drive): Add OVERLAPPED struct "ov". Add async_writes flag. (mtinfo_drive::async_wait): Add declaration. (mtinfo_drive::read): Add mt_evt parameter. (mtinfo_drive::write): Ditto. * registry.cc (load_registry_hive): Call enable_restore_privilege instead of set_process_privilege.
This commit is contained in:
@@ -9,7 +9,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
||||
details. */
|
||||
|
||||
#define MTINFO_MAGIC 0x179b2af0
|
||||
#define MTINFO_VERSION 1
|
||||
#define MTINFO_VERSION 2
|
||||
|
||||
/* Maximum number of supported partitions per drive. */
|
||||
#define MAX_PARTITION_NUM 64
|
||||
@@ -33,7 +33,8 @@ enum dirty_state
|
||||
{
|
||||
clean,
|
||||
has_read,
|
||||
has_written
|
||||
has_written,
|
||||
async_write_pending
|
||||
};
|
||||
|
||||
enum lock_state
|
||||
@@ -67,9 +68,11 @@ class mtinfo_drive
|
||||
lock_state lock;
|
||||
TAPE_GET_DRIVE_PARAMETERS _dp;
|
||||
TAPE_GET_MEDIA_PARAMETERS _mp;
|
||||
OVERLAPPED ov;
|
||||
struct status_flags
|
||||
{
|
||||
unsigned buffer_writes : 1;
|
||||
unsigned async_writes : 1;
|
||||
unsigned two_fm : 1;
|
||||
unsigned fast_eom : 1;
|
||||
unsigned auto_lock : 1;
|
||||
@@ -101,6 +104,7 @@ class mtinfo_drive
|
||||
int set_blocksize (HANDLE mt, long count);
|
||||
int get_status (HANDLE mt, struct mtget *get);
|
||||
int set_options (HANDLE mt, long options);
|
||||
int async_wait (HANDLE mt, DWORD *bytes_written);
|
||||
|
||||
public:
|
||||
void initialize (int num, bool first_time);
|
||||
@@ -108,12 +112,13 @@ public:
|
||||
int get_mp (HANDLE mt);
|
||||
int open (HANDLE mt);
|
||||
int close (HANDLE mt, bool rewind);
|
||||
int read (HANDLE mt, void *ptr, size_t &ulen);
|
||||
int write (HANDLE mt, const void *ptr, size_t &len);
|
||||
int read (HANDLE mt, HANDLE mt_evt, void *ptr, size_t &ulen);
|
||||
int write (HANDLE mt, HANDLE mt_evt, const void *ptr, size_t &len);
|
||||
int ioctl (HANDLE mt, unsigned int cmd, void *buf);
|
||||
int set_pos (HANDLE mt, int mode, long count, bool sfm_func);
|
||||
|
||||
IMPLEMENT_STATUS_FLAG (bool, buffer_writes)
|
||||
IMPLEMENT_STATUS_FLAG (bool, async_writes)
|
||||
IMPLEMENT_STATUS_FLAG (bool, two_fm)
|
||||
IMPLEMENT_STATUS_FLAG (bool, fast_eom)
|
||||
IMPLEMENT_STATUS_FLAG (bool, auto_lock)
|
||||
|
Reference in New Issue
Block a user