+Trace dumps compatible with TraceFS.

CcCanIWrite(): 'SharedCacheMap' of 'FileObject' may be NULL.

diff --git a/src/libcaptive/cc/misc.c b/src/libcaptive/cc/misc.c
index ad90a51..7842f08 100644 (file)
--- a/src/libcaptive/cc/misc.c
+++ b/src/libcaptive/cc/misc.c
@@ -42,17 +42,24 @@
  */
 BOOLEAN CcCanIWrite(IN PFILE_OBJECT FileObject,IN ULONG BytesToWrite,IN BOOLEAN Wait,IN BOOLEAN Retrying)
 {
+BOOLEAN r;
+
+       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"enter: CcCanIWrite: FileObject=0x%lX,BytesToWrite=0x%lX,Wait=%d,Retrying=%d",
+                       (long)FileObject,BytesToWrite,Wait,Retrying);
+
        g_return_val_if_fail(FileObject!=NULL,FALSE);
        g_return_val_if_fail(Wait==TRUE || Wait==FALSE,FALSE);  /* Prevent 'Wait' upgrade to 'Flags'. */
        g_return_val_if_fail(Retrying==TRUE || Retrying==FALSE,FALSE);
 
-       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"%s: FileObject=%p,BytesToWrite=0x%lX,Wait=%d,Retrying=%d",G_STRLOC,
-                       FileObject,(gulong)BytesToWrite,(gint)Wait,(gint)Retrying);
-
        /* sanity check */
-       captive_FileObject_to_SharedCacheMap(FileObject);
+       g_assert(FileObject->SectionObjectPointers!=NULL);
+       /* 'FileObject->SectionObjectPointers->SharedCacheMap' may be NULL */
 
-       return TRUE;
+       r=TRUE;
+
+       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"leave: CcCanIWrite: r=%d",r);
+
+       return r;
 }
 
 
@@ -68,17 +75,19 @@ BOOLEAN CcCanIWrite(IN PFILE_OBJECT FileObject,IN ULONG BytesToWrite,IN BOOLEAN
  */
 VOID CcSetReadAheadGranularity(IN PFILE_OBJECT FileObject,IN ULONG Granularity)
 {
+       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"enter: CcSetReadAheadGranularity: FileObject=0x%lX,Granularity=0x%lX",
+                       (long)FileObject,Granularity);
+
        g_return_if_fail(FileObject!=NULL);
        g_return_if_fail(Granularity>=PAGE_SIZE);
        g_return_if_fail((Granularity&(Granularity-1))==0);     /* Power of two */
 
-       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"%s: FileObject=%p,Granularity=0x%lX",G_STRLOC,
-                       FileObject,(gulong)Granularity);
-
        /* NOP; no caching by libcaptive */
 
        /* sanity check */
        captive_FileObject_to_SharedCacheMap(FileObject);
+
+       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"leave: CcSetReadAheadGranularity");
 }
 
 
@@ -94,12 +103,14 @@ VOID CcSetReadAheadGranularity(IN PFILE_OBJECT FileObject,IN ULONG Granularity)
  */
 VOID CcSetAdditionalCacheAttributes(IN PFILE_OBJECT FileObject,IN BOOLEAN DisableReadAhead,IN BOOLEAN DisableWriteBehind)
 {
-       g_return_if_fail(FileObject!=NULL);
+       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"enter: CcSetAdditionalCacheAttributes: FileObject=0x%lX,DisableReadAhead=%d,DisableWriteBehind=%d",
+                       (long)FileObject,DisableReadAhead,DisableWriteBehind);
 
-       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"%s: FileObject=%p,DisableReadAhead=%s,DisableWriteBehind=%s",G_STRLOC,
-                       FileObject,(DisableReadAhead ? "TRUE" : "FALSE"),(DisableWriteBehind ? "TRUE" : "FALSE"));
+       g_return_if_fail(FileObject!=NULL);
 
        /* NOP; no caching by libcaptive */
+
+       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"leave: CcSetAdditionalCacheAttributes");
 }
 
 
@@ -111,5 +122,13 @@ VOID FsRtlIncrementCcFastReadNoWait(VOID)
 
 NTSTATUS CcWaitForCurrentLazyWriterActivity(VOID)
 {
-       return STATUS_SUCCESS;
+NTSTATUS r;
+
+       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"enter: CcWaitForCurrentLazyWriterActivity");
+
+       r=STATUS_SUCCESS;
+
+       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"leave: CcWaitForCurrentLazyWriterActivity: r=0x%lX",(long)r);
+
+       return r;
 }