Ticket #18904: 18904.patch

File 18904.patch, 20.7 KB (added by adumerat, 5 weeks ago)

buildfix patchset

  • build/config_headers/tracing_config.h 

    diff --git a/build/config_headers/tracing_config.h b/build/config_headers/tracing_config.h
index 2cbab809a5..3feec7ce46 100644
    a b  
    55
    66// enable tracing (0/1)
    77#ifndef ENABLE_TRACING
    8 #   define ENABLE_TRACING 0
     8#   define ENABLE_TRACING 1
    99#endif
    1010
    1111// tracing buffer size (in bytes)
    … …  
    1818
    1919// macros specifying the tracing level for individual components (0 is disabled)
    2020
    21 #define AHCI_PORT_TRACING                       0
    22 #define ATA_DMA_TRACING                         0
    23 #define ATA_TRACING                             0
    24 #define ATAPI_TRACING                           0
    25 #define BFS_TRACING                             0
    26 #define BLOCK_CACHE_BLOCK_TRACING               0
    27 #define BLOCK_CACHE_TRANSACTION_TRACING         0
    28 #define BMESSAGE_TRACING                        0
    29 #define FILE_DESCRIPTOR_TRACING                 0
    30 #define FILE_DESCRIPTOR_TRACING_STACK_TRACE     0   /* stack trace depth */
    31 #define GUARDED_HEAP_TRACING                    0
    32 #define GUARDED_HEAP_TRACING_STACK_TRACE        0   /* stack trace depth */
    33 #define IO_CONTEXT_TRACING                      0
    34 #define IO_CONTEXT_TRACING_STACK_TRACE          0   /* stack trace depth */
    35 #define KERNEL_HEAP_TRACING                     0
    36 #define KTRACE_PRINTF_STACK_TRACE               0   /* stack trace depth */
    37 #define NET_BUFFER_TRACING                      0
    38 #define NET_BUFFER_TRACING_STACK_TRACE          0   /* stack trace depth */
    39 #define PAGE_ALLOCATION_TRACING                 0
    40 #define PAGE_ALLOCATION_TRACING_STACK_TRACE     0   /* stack trace depth */
    41 #define PAGE_DAEMON_TRACING                     0
    42 #define PAGE_STATE_TRACING                      0
    43 #define PAGE_STATE_TRACING_STACK_TRACE          0   /* stack trace depth */
    44 #define PAGE_WRITER_TRACING                     0
    45 #define PARANOIA_TRACING                        0
    46 #define PARANOIA_TRACING_STACK_TRACE            0   /* stack trace depth */
    47 #define PORT_TRACING                            0
    48 #define RUNTIME_LOADER_TRACING                  0
    49 #define SCHEDULER_TRACING                       0
    50 #define SCHEDULING_ANALYSIS_TRACING             0
    51 #define SIGNAL_TRACING                          0
    52 #define SLAB_MEMORY_MANAGER_TRACING             0
    53 #define SLAB_MEMORY_MANAGER_TRACING_STACK_TRACE 0   /* stack trace depth */
    54 #define SLAB_OBJECT_CACHE_TRACING               0
    55 #define SLAB_OBJECT_CACHE_TRACING_STACK_TRACE   0   /* stack trace depth */
    56 #define SWAP_TRACING                            0
    57 #define SYSCALL_TRACING                         0
     21#define AHCI_PORT_TRACING                       1
     22#define ATA_DMA_TRACING                         1
     23#define ATA_TRACING                             1
     24#define ATAPI_TRACING                           1
     25#define BFS_TRACING                             1
     26#define BLOCK_CACHE_BLOCK_TRACING               1
     27#define BLOCK_CACHE_TRANSACTION_TRACING         1
     28#define BMESSAGE_TRACING                        1
     29#define FILE_DESCRIPTOR_TRACING                 1
     30#define FILE_DESCRIPTOR_TRACING_STACK_TRACE     1   /* stack trace depth */
     31#define GUARDED_HEAP_TRACING                    1
     32#define GUARDED_HEAP_TRACING_STACK_TRACE        1   /* stack trace depth */
     33#define IO_CONTEXT_TRACING                      1
     34#define IO_CONTEXT_TRACING_STACK_TRACE          1   /* stack trace depth */
     35#define KERNEL_HEAP_TRACING                     1
     36#define KTRACE_PRINTF_STACK_TRACE               1   /* stack trace depth */
     37#define NET_BUFFER_TRACING                      1
     38#define NET_BUFFER_TRACING_STACK_TRACE          1   /* stack trace depth */
     39#define PAGE_ALLOCATION_TRACING                 1
     40#define PAGE_ALLOCATION_TRACING_STACK_TRACE     1   /* stack trace depth */
     41#define PAGE_DAEMON_TRACING                     1
     42#define PAGE_STATE_TRACING                      1
     43#define PAGE_STATE_TRACING_STACK_TRACE          1   /* stack trace depth */
     44#define PAGE_WRITER_TRACING                     1
     45#define PARANOIA_TRACING                        1
     46#define PARANOIA_TRACING_STACK_TRACE            1   /* stack trace depth */
     47#define PORT_TRACING                            1
     48#define RUNTIME_LOADER_TRACING                  1
     49#define SCHEDULER_TRACING                       1
     50#define SCHEDULING_ANALYSIS_TRACING             1
     51#define SIGNAL_TRACING                          1
     52#define SLAB_MEMORY_MANAGER_TRACING             1
     53#define SLAB_MEMORY_MANAGER_TRACING_STACK_TRACE 1   /* stack trace depth */
     54#define SLAB_OBJECT_CACHE_TRACING               1
     55#define SLAB_OBJECT_CACHE_TRACING_STACK_TRACE   1   /* stack trace depth */
     56#define SWAP_TRACING                            1
     57#define SYSCALL_TRACING                         1
    5858#define SYSCALL_TRACING_IGNORE_KTRACE_OUTPUT    1
    59 #define TCP_TRACING                             0
    60 #define TEAM_TRACING                            0
    61 #define TRANSLATION_MAP_TRACING                 0
    62 #define TRANSLATION_MAP_TRACING_STACK_TRACE     0   /* stack trace depth */
    63 #define USER_MALLOC_TRACING                     0
    64 #define VFS_PAGES_IO_TRACING                    0
    65 #define VM_CACHE_TRACING                        0
    66 #define VM_CACHE_TRACING_STACK_TRACE            0   /* stack trace depth */
    67 #define VM_PAGE_FAULT_TRACING                   0
    68 #define WAIT_FOR_OBJECTS_TRACING                0
     59#define TCP_TRACING                             1
     60#define TEAM_TRACING                            1
     61#define TRANSLATION_MAP_TRACING                 1
     62#define TRANSLATION_MAP_TRACING_STACK_TRACE     1   /* stack trace depth */
     63#define USER_MALLOC_TRACING                     1
     64#define VFS_PAGES_IO_TRACING                    1
     65#define VM_CACHE_TRACING                        1
     66#define VM_CACHE_TRACING_STACK_TRACE            1   /* stack trace depth */
     67#define VM_PAGE_FAULT_TRACING                   1
     68#define WAIT_FOR_OBJECTS_TRACING                1
    6969
    7070#endif  // ENABLE_TRACING
    7171

  • src/add-ons/kernel/busses/scsi/ahci/ahci_tracing.h 

    diff --git a/src/add-ons/kernel/busses/scsi/ahci/ahci_tracing.h b/src/add-ons/kernel/busses/scsi/ahci/ahci_tracing.h
index a910585f9b..edff29e49d 100644
    a b class AHCIPortTraceEntry : public AbstractTraceEntry {  
    2020        {
    2121        }
    2222
    23         void AddDump(TraceOutput& out, const char* name)
     23        //void AddDump(TraceOutput& out, const char* name)
     24        void AddDump(TraceOutput& out)
    2425        {
    2526            out.Print("ahci port");
    26             out.Print(" - %s - ", name);
     27            //out.Print(" - %s - ", name);
    2728            out.Print("controller: %p", fController);
    2829            out.Print(", index: %d", fIndex);           
    2930        }
    … … class AHCIPortTraceEntry : public AbstractTraceEntry {  
    3536
    3637class AHCIPortPrdTable : public AHCIPortTraceEntry {
    3738    public:
    38         AHCIPortPrdTable(AHCIController* controller, int index, void* address,
     39        AHCIPortPrdTable(AHCIController* controller, int index, phys_addr_t address,
    3940            size_t size)
    4041        : AHCIPortTraceEntry(controller, index)
    4142        , fAddress(address)
    … … class AHCIPortPrdTable : public AHCIPortTraceEntry {  
    4647
    4748        void AddDump(TraceOutput& out)
    4849        {
    49             AHCIPortTraceEntry::AddDump(out, "prd table");
     50            //AHCIPortTraceEntry::AddDump(out, "prd table");
     51            AHCIPortTraceEntry::AddDump(out);
    5052
    51             out.Print(", address: %p", fAddress);
    52             out.Print(", size: %lu", fSize);
     53            out.Print(", address: %ld", fAddress);
     54            out.Print(", size: %u", fSize);
    5355        }
    5456
    55         void* fAddress;
     57        phys_addr_t fAddress;
    5658        int fSize;
    5759};
    5860

  • src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp 

    diff --git a/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp b/src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
index cd168a0b62..03a344cdaa 100644
    a b public:  
    113113
    114114    virtual void AddDump(TraceOutput& out)
    115115    {
    116         out.Print("bfs:%s: block %lld (%p), sum %lu, s/l %lu/%lu", fLabel,
     116        out.Print("bfs:%s: block %ld (%p), sum %u, s/l %u/%u", fLabel,
    117117            fBlock, fData, fSum, fStart, fLength);
    118118    }
    119119
    … … public:  
    141141
    142142    virtual void AddDump(TraceOutput& out)
    143143    {
    144         out.Print("bfs:%s: block %ld, %08lx -> %08lx", fLabel,
     144        out.Print("bfs:%s: block %d, %08x -> %08x", fLabel,
    145145            fBlock, fOldData, fNewData);
    146146    }
    147147
    … … dump_block_allocator_blocks(int argc, char** argv)  
    14381438            if (block >= first && block <= last) {
    14391439                out.Clear();
    14401440                const char* dump = out.DumpEntry(entry);
    1441                 kprintf("%5ld. %s\n", iterator.Index(), dump);
     1441                kprintf("%5d. %s\n", iterator.Index(), dump);
    14421442            }
    14431443        } else if (Free* entry = dynamic_cast<Free*>(_entry)) {
    14441444            off_t first = volume->ToBlock(entry->Run());
    … … dump_block_allocator_blocks(int argc, char** argv)  
    14461446            if (block >= first && block <= last) {
    14471447                out.Clear();
    14481448                const char* dump = out.DumpEntry(entry);
    1449                 kprintf("%5ld. %s\n", iterator.Index(), dump);
     1449                kprintf("%5d. %s\n", iterator.Index(), dump);
    14501450            }
    14511451        }
    14521452    }

  • src/add-ons/kernel/file_systems/bfs/Inode.cpp 

    diff --git a/src/add-ons/kernel/file_systems/bfs/Inode.cpp b/src/add-ons/kernel/file_systems/bfs/Inode.cpp
index 5298545911..8f15d53c98 100644
    a b public:  
    3939
    4040    virtual void AddDump(TraceOutput& out)
    4141    {
    42         out.Print("bfs:Create %lld (%p), parent %lld (%p), \"%s\", "
    43             "mode %lx, omode %x, type %lx", fID, fInode, fParentID,
     42        out.Print("bfs:Create %ld (%p), parent %ld (%p), \"%s\", "
     43            "mode %x, omode %x, type %x", fID, fInode, fParentID,
    4444            fParent, fName, fMode, fOpenMode, fType);
    4545    }
    4646
    … … public:  
    6868
    6969    virtual void AddDump(TraceOutput& out)
    7070    {
    71         out.Print("bfs:Remove %lld (%p), \"%s\"", fID, fInode, fName);
     71        out.Print("bfs:Remove %ld (%p), \"%s\"", fID, fInode, fName);
    7272    }
    7373
    7474private:
    … … public:  
    9090
    9191    virtual void AddDump(TraceOutput& out)
    9292    {
    93         out.Print("bfs:%s %lld (%p)\n", fAction, fID, fInode);
     93        out.Print("bfs:%s %ld (%p)\n", fAction, fID, fInode);
    9494    }
    9595
    9696private:
    … … public:  
    114114
    115115    virtual void AddDump(TraceOutput& out)
    116116    {
    117         out.Print("bfs:%s %lld (%p), %lld -> %lld", fTrim ? "Trim" : "Resize",
     117        out.Print("bfs:%s %ld (%p), %ld -> %ld", fTrim ? "Trim" : "Resize",
    118118            fID, fInode, fOldSize, fNewSize);
    119119    }
    120120

  • src/add-ons/kernel/file_systems/bfs/Journal.cpp 

    diff --git a/src/add-ons/kernel/file_systems/bfs/Journal.cpp b/src/add-ons/kernel/file_systems/bfs/Journal.cpp
index 33b91bbd67..9a4b9247a1 100644
    a b public:  
    110110    virtual void AddDump(TraceOutput& out)
    111111    {
    112112#ifdef BFS_DEBUGGER_COMMANDS
    113         out.Print("bfs:j:%s entry %p id %ld, start %lu, length %lu, log %s "
    114             "%lu\n", fStarted ? "Started" : "Written", fEntry,
     113        out.Print("bfs:j:%s entry %p id %d, start %u, length %u, log %s "
     114            "%u\n", fStarted ? "Started" : "Written", fEntry,
    115115            fTransactionID, fStart, fLength,
    116116            fStarted ? "end" : "start", fLogPosition);
    117117#else

  • src/add-ons/kernel/network/stack/net_buffer.cpp 

    diff --git a/src/add-ons/kernel/network/stack/net_buffer.cpp b/src/add-ons/kernel/network/stack/net_buffer.cpp
index cc4ae07bbe..ed841c558a 100644
    a b public:  
    301301
    302302    virtual void AddDump(TraceOutput& out)
    303303    {
    304         out.Print("net buffer split: buffer: %p, offset: %lu "
     304        out.Print("net buffer split: buffer: %p, offset: %u "
    305305            "-> %p", fBuffer, fOffset, fNewBuffer);
    306306    }
    307307
    … … public:  
    351351    virtual void AddDump(TraceOutput& out)
    352352    {
    353353        out.Print("net buffer append cloned: buffer: %p, from: %p, "
    354             "offset: %lu, size: %lu", fBuffer, fSource, fOffset, fSize);
     354            "offset: %u, size: %lu", fBuffer, fSource, fOffset, fSize);
    355355    }
    356356
    357357private:
    … … public:  
    459459
    460460    virtual void AddDump(TraceOutput& out)
    461461    {
    462         out.Print("net buffer read: buffer: %p, offset: %lu, size: %lu, "
     462        out.Print("net buffer read: buffer: %p, offset: %u, size: %lu, "
    463463            "data: %p", fBuffer, fOffset, fSize, fData);
    464464    }
    465465
    … … public:  
    484484
    485485    virtual void AddDump(TraceOutput& out)
    486486    {
    487         out.Print("net buffer write: buffer: %p, offset: %lu, size: %lu, "
     487        out.Print("net buffer write: buffer: %p, offset: %u, size: %lu, "
    488488            "data: %p", fBuffer, fOffset, fSize, fData);
    489489    }
    490490

  • src/kits/app/Message.cpp 

    diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp
index 7ce543f3c3..f4e7ebf8e0 100644
    a b BMessage::_SendMessage(port_id port, team_id portOwner, int32 token,  
    22282228    header->flags |= MESSAGE_FLAG_WAS_DELIVERED;
    22292229
    22302230    if (direct == NULL) {
    2231         KTRACE("BMessage send remote: team: %ld, port: %ld, token: %ld, "
     2231        KTRACE("BMessage send remote: team: %d, port: %d, token: %d, "
    22322232            "message: '%c%c%c%c'", portOwner, port, token,
    22332233            char(what >> 24), char(what >> 16), char(what >> 8), (char)what);
    22342234
    … … BMessage::_SendMessage(port_id port, team_id portOwner, int32 token,  
    22492249    // target looper. Thus we don't want to do any ops that depend on
    22502250    // members of this after the enqueue.
    22512251    if (direct != NULL) {
    2252         KTRACE("BMessage send direct: port: %ld, token: %ld, "
     2252        KTRACE("BMessage send direct: port: %d, token: %d, "
    22532253            "message: '%c%c%c%c'", port, token,
    22542254            char(what >> 24), char(what >> 16), char(what >> 8), (char)what);
    22552255

  • src/system/kernel/arch/x86/arch_vm.cpp 

    diff --git a/src/system/kernel/arch/x86/arch_vm.cpp b/src/system/kernel/arch/x86/arch_vm.cpp
index f238de2936..99925cf371 100644
    a b  
    4141#endif
    4242
    4343// 0: disabled, 1: some, 2: more
    44 #define TRACE_MTRR_ARCH_VM 1
     44#define TRACE_MTRR_ARCH_VM 2
    4545
    4646#if TRACE_MTRR_ARCH_VM >= 1
    4747#   define TRACE_MTRR(x...) dprintf(x)

  • src/system/kernel/events/wait_for_objects.cpp 

    diff --git a/src/system/kernel/events/wait_for_objects.cpp b/src/system/kernel/events/wait_for_objects.cpp
index 40bce55008..f875367871 100644
    a b class SelectTraceEntry : public AbstractTraceEntry {  
    118118            }
    119119        }
    120120
    121         void AddDump(TraceOutput& out, const char* name)
     121        //void AddDump(TraceOutput& out, const char* name)
     122        void AddDump(TraceOutput& out)
    122123        {
    123             out.Print(name);
     124            //out.Print(name);
    124125
    125126            _PrintSet(out, "read", fReadSet);
    126127            _PrintSet(out, ", write", fWriteSet);
    … … class SelectBegin : public SelectTraceEntry {  
    171172
    172173        virtual void AddDump(TraceOutput& out)
    173174        {
    174             SelectTraceEntry::AddDump(out, "select begin: ");
     175            //SelectTraceEntry::AddDump(out, "select begin: ");
     176            SelectTraceEntry::AddDump(out);
    175177            out.Print(", timeout: %" B_PRIdBIGTIME, fTimeout);
    176178        }
    177179
    … … class SelectDone : public SelectTraceEntry {  
    195197        virtual void AddDump(TraceOutput& out)
    196198        {
    197199            if (fStatus == B_OK)
    198                 SelectTraceEntry::AddDump(out, "select done:  ");
     200                //SelectTraceEntry::AddDump(out, "select done:  ");
     201                SelectTraceEntry::AddDump(out);
    199202            else
    200203                out.Print("select done:  error: %#" B_PRIx32, fStatus);
    201204        }

  • src/system/kernel/fs/vfs.cpp 

    diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp
index fd338094a8..5e2a50834c 100644
    a b protected:  
    617617            sizeof(generic_io_vec) * count, false);
    618618    }
    619619
    620     void AddDump(TraceOutput& out, const char* mode)
     620    //void AddDump(TraceOutput& out, const char* mode)
     621    void AddDump(TraceOutput& out)
    621622    {
    622         out.Print("vfs pages io %5s: vnode: %p (%" B_PRId32 ", %" B_PRId64 "), "
     623        out.Print("vfs pages io vnode: %p (%" B_PRId32 ", %" B_PRId64 "), "
    623624            "cookie: %p, pos: %" B_PRIdOFF ", size: %" B_PRIu64 ", vecs: {",
    624             mode, fVnode, fMountID, fNodeID, fCookie, fPos,
     625            fVnode, fMountID, fNodeID, fCookie, fPos,
    625626            (uint64)fBytesRequested);
     627        //out.Print("vfs pages io %5s: vnode: %p (%" B_PRId32 ", %" B_PRId64 "), "
     628        //  "cookie: %p, pos: %" B_PRIdOFF ", size: %" B_PRIu64 ", vecs: {",
     629        //  mode, fVnode, fMountID, fNodeID, fCookie, fPos,
     630        //  (uint64)fBytesRequested);
    626631
    627632        if (fVecs != NULL) {
    628633            for (uint32 i = 0; i < fCount; i++) {
    … … public:  
    668673
    669674    virtual void AddDump(TraceOutput& out)
    670675    {
    671         PagesIOTraceEntry::AddDump(out, "read");
     676        //PagesIOTraceEntry::AddDump(out, "read");
     677        PagesIOTraceEntry::AddDump(out);
    672678    }
    673679};
    674680
    … … public:  
    688694
    689695    virtual void AddDump(TraceOutput& out)
    690696    {
    691         PagesIOTraceEntry::AddDump(out, "write");
     697        //PagesIOTraceEntry::AddDump(out, "write");
     698        PagesIOTraceEntry::AddDump(out);
    692699    }
    693700};
    694701

  • src/system/kernel/port.cpp 

    diff --git a/src/system/kernel/port.cpp b/src/system/kernel/port.cpp
index cacc36a330..b262e2c0aa 100644
    a b public:  
    261261
    262262    virtual void AddDump(TraceOutput& out)
    263263    {
    264         out.Print("port %ld created, name \"%s\", owner %ld, capacity %ld",
     264        out.Print("port %d created, name \"%s\", owner %d, capacity %d",
    265265            fID, fName, fOwner, fCapacity);
    266266    }
    267267
    … … public:  
    284284
    285285    virtual void AddDump(TraceOutput& out)
    286286    {
    287         out.Print("port %ld deleted", fID);
     287        out.Print("port %d deleted", fID);
    288288    }
    289289
    290290private:
    … … public:  
    319319
    320320    virtual void AddDump(TraceOutput& out)
    321321    {
    322         out.Print("port %ld read, read %ld, write %ld, code %lx: %ld",
     322        out.Print("port %d read, read %d, write %d, code %x: %ld",
    323323            fID, fReadCount, fWriteCount, fCode, fResult);
    324324    }
    325325
    … … public:  
    349349
    350350    virtual void AddDump(TraceOutput& out)
    351351    {
    352         out.Print("port %ld write, read %ld, write %ld, code %lx, size %ld: %ld",
     352        out.Print("port %d write, read %d, write %d, code %x, size %ld: %ld",
    353353            fID, fReadCount, fWriteCount, fCode, fBufferSize, fResult);
    354354    }
    355355
    … … public:  
    390390
    391391    virtual void AddDump(TraceOutput& out)
    392392    {
    393         out.Print("port %ld info, read %ld, write %ld, code %lx: %ld",
     393        out.Print("port %d info, read %d, write %d, code %x: %ld",
    394394            fID, fReadCount, fWriteCount, fCode, fResult);
    395395    }
    396396
    … … public:  
    417417
    418418    virtual void AddDump(TraceOutput& out)
    419419    {
    420         out.Print("port %ld owner change from %ld to %ld: %s", fID, fOldOwner,
     420        out.Print("port %d owner change from %d to %d: %s", fID, fOldOwner,
    421421            fNewOwner, strerror(fStatus));
    422422    }
    423423

  • src/system/kernel/vm/VMAnonymousCache.cpp 

    diff --git a/src/system/kernel/vm/VMAnonymousCache.cpp b/src/system/kernel/vm/VMAnonymousCache.cpp
index 6f94fcfc9f..d347841a24 100644
    a b public:  
    189189
    190190    virtual void AddDump(TraceOutput& out)
    191191    {
    192         out.Print("swap read:  cache %p, page index: %lu <- swap slot: %lu",
     192        out.Print("swap read:  cache %p, page index: %lu <- swap slot: %u",
    193193            fCache, fPageIndex, fSwapSlotIndex);
    194194    }
    195195
    … … public:  
    213213
    214214    virtual void AddDump(TraceOutput& out)
    215215    {
    216         out.Print("swap write: cache %p, page index: %lu -> swap slot: %lu",
     216        out.Print("swap write: cache %p, page index: %lu -> swap slot: %u",
    217217            fCache, fPageIndex, fSwapSlotIndex);
    218218    }
    219219

  • src/system/kernel/vm/VMCache.cpp 

    diff --git a/src/system/kernel/vm/VMCache.cpp b/src/system/kernel/vm/VMCache.cpp
index 1e8a27b9d9..841e88a328 100644
    a b class Rebase : public VMCacheTraceEntry {  
    203203
    204204        virtual void AddDump(TraceOutput& out)
    205205        {
    206             out.Print("vm cache rebase: cache: %p, base: %lld -> %lld", fCache,
     206            out.Print("vm cache rebase: cache: %p, base: %ld -> %ld", fCache,
    207207                fOldBase, fBase);
    208208        }
    209209

  • src/system/kernel/vm/vm.cpp 

    diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp
index bf86415edd..c5cb45edb5 100644
    a b public:  
    344344                out.Print("page fault error: no area");
    345345                break;
    346346            case PAGE_FAULT_ERROR_KERNEL_ONLY:
    347                 out.Print("page fault error: area: %ld, kernel only", fArea);
     347                out.Print("page fault error: area: %d, kernel only", fArea);
    348348                break;
    349349            case PAGE_FAULT_ERROR_WRITE_PROTECTED:
    350                 out.Print("page fault error: area: %ld, write protected",
     350                out.Print("page fault error: area: %d, write protected",
    351351                    fArea);
    352352                break;
    353353            case PAGE_FAULT_ERROR_READ_PROTECTED:
    354                 out.Print("page fault error: area: %ld, read protected", fArea);
     354                out.Print("page fault error: area: %d, read protected", fArea);
    355355                break;
    356356            case PAGE_FAULT_ERROR_EXECUTE_PROTECTED:
    357                 out.Print("page fault error: area: %ld, execute protected",
     357                out.Print("page fault error: area: %d, execute protected",
    358358                    fArea);
    359359                break;
    360360            case PAGE_FAULT_ERROR_KERNEL_BAD_USER_MEMORY:
    … … public:  
    364364                out.Print("page fault error: no address space");
    365365                break;
    366366            default:
    367                 out.Print("page fault error: area: %ld, error: %s", fArea,
     367                out.Print("page fault error: area: %d, error: %s", fArea,
    368368                    strerror(fError));
    369369                break;
    370370        }
    … … public:  
    391391
    392392    virtual void AddDump(TraceOutput& out)
    393393    {
    394         out.Print("page fault done: area: %ld, top cache: %p, cache: %p, "
     394        out.Print("page fault done: area: %d, top cache: %p, cache: %p, "
    395395            "page: %p", fArea, fTopCache, fCache, fPage);
    396396    }
    397397

  • src/system/kernel/vm/vm_page.cpp 

    diff --git a/src/system/kernel/vm/vm_page.cpp b/src/system/kernel/vm/vm_page.cpp
index 880b204bdc..c999cb052a 100644
    a b class ActivatePage : public AbstractTraceEntry {  
    433433    public:
    434434        ActivatePage(vm_page* page)
    435435            :
    436             fCache(page->cache),
     436            fCache(page->Cache()),
    437437            fPage(page)
    438438        {
    439439            Initialized();
    … … class ActivatePage : public AbstractTraceEntry {  
    445445        }
    446446
    447447    private:
    448         VMCache*    fCache;
     448        VMCache*    fCache;
    449449        vm_page*    fPage;
    450450};
    451451
    … … class DeactivatePage : public AbstractTraceEntry {  
    454454    public:
    455455        DeactivatePage(vm_page* page)
    456456            :
    457             fCache(page->cache),
     457            fCache(page->Cache()),
    458458            fPage(page)
    459459        {
    460460            Initialized();
    … … class DeactivatePage : public AbstractTraceEntry {  
    466466        }
    467467
    468468    private:
    469         VMCache*    fCache;
     469        VMCache*    fCache;
    470470        vm_page*    fPage;
    471471};
    472472
    … … class FreedPageSwap : public AbstractTraceEntry {  
    475475    public:
    476476        FreedPageSwap(vm_page* page)
    477477            :
    478             fCache(page->cache),
     478            fCache(page->Cache()),
    479479            fPage(page)
    480480        {
    481481            Initialized();
    … … class FreedPageSwap : public AbstractTraceEntry {  
    487487        }
    488488
    489489    private:
    490         VMCache*    fCache;
     490        VMCache*    fCache;
    491491        vm_page*    fPage;
    492492};
    493493
    … … class WritePage : public AbstractTraceEntry {  
    520520        }
    521521
    522522    private:
    523         VMCache*    fCache;
     523        const VMCache*  fCache;
    524524        vm_page*    fPage;
    525525};
    526526