Wine-Commits

wine-commits@list.winehq.org

November 2006

3 participants
792 discussions

Alexandre Julliard : ntdll: Simplify wine_server_handle_to_fd.
by Alexandre Julliard Nov. 1, 2006

Nov. 1, 2006

Module: wine Branch: master Commit: 226a14a48308f2a2a78104b8503404bba3f10522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=226a14a48308f2a2a78104b85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 13:27:18 2006 +0100 ntdll: Simplify wine_server_handle_to_fd. Now that we have a critical section, races are no longer possible. --- dlls/ntdll/server.c | 105 +++++++++++++++++++++++--------------------------- 1 files changed, 48 insertions(+), 57 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index a128930..7df8e02 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -493,76 +493,67 @@ int wine_server_handle_to_fd( obj_handle RtlEnterCriticalSection( &fd_cache_section ); *unix_fd = -1; - for (;;) + + SERVER_START_REQ( get_handle_fd ) { - SERVER_START_REQ( get_handle_fd ) + req->handle = handle; + req->access = access; + if (!(ret = wine_server_call( req ))) { - req->handle = handle; - req->access = access; - if (!(ret = wine_server_call( req ))) - { - fd = reply->fd; - removable = reply->removable; - if (flags) *flags = reply->flags; - } + fd = reply->fd; + removable = reply->removable; + if (flags) *flags = reply->flags; } - SERVER_END_REQ; - if (ret) break; + } + SERVER_END_REQ; + if (ret) goto done; - if (fd != -1) - { - if ((fd = dup(fd)) == -1) ret = FILE_GetNtStatus(); - break; - } + if (fd != -1) + { + if ((fd = dup(fd)) == -1) ret = FILE_GetNtStatus(); + goto done; + } - /* it wasn't in the cache, get it from the server */ - fd = receive_fd( &fd_handle ); - if (fd == -1) - { - ret = STATUS_TOO_MANY_OPENED_FILES; - break; - } - if (fd_handle != handle) removable = -1; + /* it wasn't in the cache, get it from the server */ + fd = receive_fd( &fd_handle ); + if (fd == -1) + { + ret = STATUS_TOO_MANY_OPENED_FILES; + goto done; + } + assert( fd_handle == handle ); - if (removable == -1) - { - FILE_FS_DEVICE_INFORMATION info; - if (FILE_GetDeviceInfo( fd, &info ) == STATUS_SUCCESS) - removable = (info.Characteristics & FILE_REMOVABLE_MEDIA) != 0; - } - else if (removable) break; /* don't cache it */ + if (removable == -1) + { + FILE_FS_DEVICE_INFORMATION info; + if (FILE_GetDeviceInfo( fd, &info ) == STATUS_SUCCESS) + removable = (info.Characteristics & FILE_REMOVABLE_MEDIA) != 0; + } + else if (removable) goto done; /* don't cache it */ - /* and store it back into the cache */ - SERVER_START_REQ( set_handle_fd ) + /* and store it back into the cache */ + SERVER_START_REQ( set_handle_fd ) + { + req->handle = fd_handle; + req->fd = fd; + req->removable = removable; + if (!(ret = wine_server_call( req ))) { - req->handle = fd_handle; - req->fd = fd; - req->removable = removable; - if (!(ret = wine_server_call( req ))) + if (reply->cur_fd != -1) /* it has been cached */ { - if (reply->cur_fd != -1) /* it has been cached */ - { - if (reply->cur_fd != fd) close( fd ); /* someone was here before us */ - if ((fd = dup(reply->cur_fd)) == -1) ret = FILE_GetNtStatus(); - } - } - else - { - close( fd ); - fd = -1; + if (reply->cur_fd != fd) close( fd ); /* someone was here before us */ + if ((fd = dup(reply->cur_fd)) == -1) ret = FILE_GetNtStatus(); } } - SERVER_END_REQ; - if (ret) break; - - if (fd_handle == handle) break; - /* if we received a different handle this means there was - * a race with another thread; we restart everything from - * scratch in this case. - */ - close( fd ); + else + { + close( fd ); + fd = -1; + } } + SERVER_END_REQ; +done: RtlLeaveCriticalSection( &fd_cache_section ); if (!ret) *unix_fd = fd; return ret;

1 0

Alexandre Julliard : ntdll: Added NetBSD fstatvfs support.
by Alexandre Julliard Nov. 1, 2006

Nov. 1, 2006

Module: wine Branch: master Commit: 0d29ba96d3bdd8e6e4ca05f01a14169549d48a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d29ba96d3bdd8e6e4ca05f01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 13:15:57 2006 +0100 ntdll: Added NetBSD fstatvfs support. --- dlls/ntdll/file.c | 72 +++++++++++++++++++++++++++++++++-------------------- 1 files changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0d189d1..18a0e09 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1550,6 +1550,42 @@ NTSTATUS WINAPI NtQueryAttributesFile( c } +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__APPLE__) +/* helper for FILE_GetDeviceInfo to hide some platform differences in fstatfs */ +static inline get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, const char *fstypename, + size_t fstypesize, unsigned int flags ) +{ + if (!strncmp("cd9660", fstypename, fstypesize) || + !strncmp("udf", fstypename, fstypesize)) + { + info->DeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; + /* Don't assume read-only, let the mount options set it below */ + info->Characteristics |= FILE_REMOVABLE_MEDIA; + } + else if (!strncmp("nfs", fstypename, fstypesize) || + !strncmp("nwfs", fstypename, fstypesize) || + !strncmp("smbfs", fstypename, fstypesize) || + !strncmp("afpfs", fstypename, fstypesize)) + { + info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; + info->Characteristics |= FILE_REMOTE_DEVICE; + } + else if (!strncmp("procfs", fstypename, fstypesize)) + info->DeviceType = FILE_DEVICE_VIRTUAL_DISK; + else + info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; + + if (flags & MNT_RDONLY) + info->Characteristics |= FILE_READ_ONLY_DEVICE; + + if (!(flags & MNT_LOCAL)) + { + info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; + info->Characteristics |= FILE_REMOTE_DEVICE; + } +} +#endif + /****************************************************************************** * FILE_GetDeviceInfo * @@ -1627,37 +1663,19 @@ #if defined(linux) && defined(HAVE_FSTAT #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) struct statfs stfs; - /* The proper way to do this in FreeBSD seems to be with the - * name rather than the type, since their linux-compatible - * fstatfs call converts the name to one of the Linux types. - */ if (fstatfs( fd, &stfs ) < 0) info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; - else if (!strncmp("cd9660", stfs.f_fstypename, sizeof(stfs.f_fstypename)) || - !strncmp("udf", stfs.f_fstypename, sizeof(stfs.f_fstypename))) - { - info->DeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; - /* Don't assume read-only, let the mount options set it below */ - info->Characteristics |= FILE_REMOVABLE_MEDIA; - } - else if (!strncmp("nfs", stfs.f_fstypename, sizeof(stfs.f_fstypename)) || - !strncmp("nwfs", stfs.f_fstypename, sizeof(stfs.f_fstypename))) - { - info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; - info->Characteristics |= FILE_REMOTE_DEVICE; - } - else if (!strncmp("procfs", stfs.f_fstypename, - sizeof(stfs.f_fstypename))) - info->DeviceType = FILE_DEVICE_VIRTUAL_DISK; else + get_device_info_fstatfs( info, stfs.f_fstypename, + sizeof(stfs.f_fstypename), stfs.f_flags ); +#elif defined(__NetBSD__) + struct statvfs stfs; + + if (fstatvfs( fd, &stfs) < 0) info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; - if (stfs.f_flags & MNT_RDONLY) - info->Characteristics |= FILE_READ_ONLY_DEVICE; - if (!(stfs.f_flags & MNT_LOCAL)) - { - info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; - info->Characteristics |= FILE_REMOTE_DEVICE; - } + else + get_device_info_fstatfs( info, stfs.f_fstypename, + sizeof(stfs.f_fstypename), stfs.f_flag ); #elif defined(sun) /* Use dkio to work out device types */ {

1 0

Jump to page: