changing many printouts

This commit is contained in:
Olga Kornievskaia 2012-02-13 16:08:21 -05:00
parent 48d6775211
commit d42f769bff
5 changed files with 338 additions and 261 deletions

View file

@ -168,6 +168,7 @@ static int marshall_getattr(unsigned char *buffer, uint32_t *length, nfs41_upcal
} }
status = safe_write(&buffer, length, &args->ctime, sizeof(args->ctime)); status = safe_write(&buffer, length, &args->ctime, sizeof(args->ctime));
if (status) goto out; if (status) goto out;
dprintf(1, "NFS41_FILE_QUERY: downcall changattr=%llu\n", args->ctime);
out: out:
return status; return status;
} }

View file

@ -655,7 +655,7 @@ static int marshall_open(unsigned char *buffer, uint32_t *length, nfs41_upcall *
goto out; goto out;
} }
} }
dprintf(2, "NFS41_OPEN: passing open_state=0x%p mode %o changeattr 0x%x\n", dprintf(2, "NFS41_OPEN: downcall open_state=0x%p mode %o changeattr 0x%llu\n",
upcall->state_ref, args->mode, args->changeattr); upcall->state_ref, args->mode, args->changeattr);
out: out:
return status; return status;

View file

@ -200,7 +200,7 @@ void print_driver_state(int state)
void print_basic_info(int on, PFILE_BASIC_INFORMATION info) void print_basic_info(int on, PFILE_BASIC_INFORMATION info)
{ {
if (!on) return; if (!on) return;
DbgP("BASIC_INFO: Create=%x Access=%x Write=%x Change=%x Attr=%x\n", DbgP("BASIC_INFO: Create=%lx Access=%lx Write=%lx Change=%lx Attr=%x\n",
info->CreationTime.QuadPart, info->LastAccessTime.QuadPart, info->CreationTime.QuadPart, info->LastAccessTime.QuadPart,
info->LastWriteTime.QuadPart, info->ChangeTime.QuadPart, info->LastWriteTime.QuadPart, info->ChangeTime.QuadPart,
info->FileAttributes); info->FileAttributes);
@ -208,9 +208,10 @@ void print_basic_info(int on, PFILE_BASIC_INFORMATION info)
void print_std_info(int on, PFILE_STANDARD_INFORMATION info) void print_std_info(int on, PFILE_STANDARD_INFORMATION info)
{ {
if (!on) return; if (!on) return;
DbgP("STD_INFO: Type=%s #Links=%d Alloc=%x EOF=%x Delete=%d\n", DbgP("STD_INFO: Type=%s #Links=%d Alloc=%lx EOF=%lx Delete=%d\n",
info->Directory?"DIR":"FILE", info->NumberOfLinks, info->Directory?"DIR":"FILE", info->NumberOfLinks,
info->AllocationSize, info->EndOfFile, info->DeletePending); info->AllocationSize.QuadPart, info->EndOfFile.QuadPart,
info->DeletePending);
} }
void print_ea_info(int on, PFILE_FULL_EA_INFORMATION info) void print_ea_info(int on, PFILE_FULL_EA_INFORMATION info)
@ -668,6 +669,7 @@ void print_open_error(int on, int status)
void print_wait_status(int on, const char *prefix, NTSTATUS status, void print_wait_status(int on, const char *prefix, NTSTATUS status,
const char *opcode, PVOID entry, LONGLONG xid) const char *opcode, PVOID entry, LONGLONG xid)
{ {
if (!on) return;
switch (status) { switch (status) {
case STATUS_SUCCESS: case STATUS_SUCCESS:
if (opcode) if (opcode)

View file

@ -60,18 +60,18 @@ void print_wait_status(int on, const char *str, NTSTATUS status,
void print_acl_args(SECURITY_INFORMATION info); void print_acl_args(SECURITY_INFORMATION info);
#define DbgEn() DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, \ #define DbgEn() DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, \
"--> [%s] [%d] %s\n", _DRIVER_NAME_, IoGetCurrentProcess(), \ "--> [%s] [%04x] %s\n", _DRIVER_NAME_, PsGetCurrentProcessId(), \
__FUNCTION__); try { __FUNCTION__); try {
#define DbgEx() DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, \ #define DbgEx() DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, \
"<-- [%s] [%d] %s status = %08lx\n", _DRIVER_NAME_, IoGetCurrentProcess(), \ "<-- [%s] [%04x] %s status = %08lx\n", _DRIVER_NAME_, PsGetCurrentProcessId(), \
__FUNCTION__, status); \ __FUNCTION__, status); \
} except (EXCEPTION_EXECUTE_HANDLER) { \ } except (EXCEPTION_EXECUTE_HANDLER) { \
status = GetExceptionCode() ; \ status = GetExceptionCode() ; \
DbgP("Exception encountered with value = Ox%x\n", status); \ DbgP("Exception encountered with value = Ox%x\n", status); \
} }
#define DbgR() DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, \ #define DbgR() DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL, \
"<-- [%s] [%d] %s\n", _DRIVER_NAME_, IoGetCurrentProcess(), __FUNCTION__); \ "<-- [%s] [%04x] %s\n", _DRIVER_NAME_, PsGetCurrentProcessId(), __FUNCTION__); \
} except (EXCEPTION_EXECUTE_HANDLER) { \ } except (EXCEPTION_EXECUTE_HANDLER) { \
NTSTATUS status; \ NTSTATUS status; \
status = GetExceptionCode() ; \ status = GetExceptionCode() ; \

File diff suppressed because it is too large Load diff