VirtualBox

Changeset 56648 in vbox


Ignore:
Timestamp:
Jun 25, 2015 9:57:41 PM (9 years ago)
Author:
vboxsync
Message:

Audio: Remove DEV_AUDIO logging group and split it up into per device and driver groups for finer grained logging

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/log.h

    r56453 r56648  
    6060    /** The default VBox group. */
    6161    LOG_GROUP_DEFAULT = RTLOGGROUP_FIRST_USER,
     62    /** Audio mixer group. */
     63    LOG_GROUP_AUDIO_MIXER,
     64    /** Audio mixer buffer group. */
     65    LOG_GROUP_AUDIO_MIXER_BUFFER,
    6266    /** Auto-logon group. */
    6367    LOG_GROUP_AUTOLOGON,
    … …  
    7882    /** Generic Device group. */
    7983    LOG_GROUP_DEV,
     84    /** AC97 Device group. */
     85    LOG_GROUP_DEV_AC97,
    8086    /** ACPI Device group. */
    8187    LOG_GROUP_DEV_ACPI,
    … …  
    8490    /** APIC Device group. */
    8591    LOG_GROUP_DEV_APIC,
    86     /** Audio Device group. */
    87     LOG_GROUP_DEV_AUDIO,
    8892    /** BusLogic SCSI host adapter group. */
    8993    LOG_GROUP_DEV_BUSLOGIC,
    … …  
    100104    /** Guest Interface Manager Device group. */
    101105    LOG_GROUP_DEV_GIM,
     106    /** HDA Device group. */
     107    LOG_GROUP_DEV_HDA,
     108    /** HDA Codec Device group. */
     109    LOG_GROUP_DEV_HDA_CODEC,
    102110    /** High Precision Event Timer Device group. */
    103111    LOG_GROUP_DEV_HPET,
    … …  
    136144    /** RTC Device group. */
    137145    LOG_GROUP_DEV_RTC,
     146    /** SB16 Device group. */
     147    LOG_GROUP_DEV_SB16,
    138148    /** Serial Device group */
    139149    LOG_GROUP_DEV_SERIAL,
    … …  
    162172    /** ACPI driver group */
    163173    LOG_GROUP_DRV_ACPI,
     174    /** Audio driver group */
     175    LOG_GROUP_DRV_AUDIO,
    164176    /** Block driver group. */
    165177    LOG_GROUP_DRV_BLOCK,
    … …  
    172184    /** Floppy media driver group. */
    173185    LOG_GROUP_DRV_FLOPPY,
     186    /** Host Audio driver group. */
     187    LOG_GROUP_DRV_HOST_AUDIO,
    174188    /** Host Base block driver group. */
    175189    LOG_GROUP_DRV_HOST_BASE,
    … …  
    220234    /** VBox HDD container media driver group. */
    221235    LOG_GROUP_DRV_VD,
     236    /** VRDE audio driver group. */
     237    LOG_GROUP_DRV_VRDE_AUDIO,
    222238    /** Virtual Switch transport driver group */
    223239    LOG_GROUP_DRV_VSWITCH,
    … …  
    783799    RT_LOGGROUP_NAMES, \
    784800    "DEFAULT",      \
     801    "AUDIO_MIXER",  \
     802    "AUDIO_MIXER_BUFFER", \
    785803    "AUTOLOGON",    \
    786804    "CFGM",         \
    … …  
    792810    "DBGG",         \
    793811    "DEV",          \
     812    "DEV_AC97",     \
    794813    "DEV_ACPI",     \
    795814    "DEV_AHCI",     \
    796815    "DEV_APIC",     \
    797     "DEV_AUDIO",    \
    798816    "DEV_BUSLOGIC", \
    799817    "DEV_DMA",      \
    … …  
    803821    "DEV_FDC",      \
    804822    "DEV_GIM",      \
     823    "DEV_HDA",      \
     824    "DEV_HDA_CODEC", \
    805825    "DEV_HPET",     \
    806826    "DEV_IDE",      \
    … …  
    821841    "DEV_PIT",      \
    822842    "DEV_RTC",      \
     843    "DEV_SB16",     \
    823844    "DEV_SERIAL",   \
    824845    "DEV_SMC",      \
    … …  
    834855    "DRV",          \
    835856    "DRV_ACPI",     \
     857    "DRV_AUDIO",    \
    836858    "DRV_BLOCK",    \
    837859    "DRV_CHAR",     \
    … …  
    839861    "DRV_DISPLAY",  \
    840862    "DRV_FLOPPY",   \
     863    "DRV_HOST_AUDIO", \
    841864    "DRV_HOST_BASE", \
    842865    "DRV_HOST_DVD", \
    … …  
    863886    "DRV_VBOXHDD",  \
    864887    "DRV_VD",       \
     888    "DRV_VRDE_AUDIO", \
    865889    "DRV_VSWITCH",  \
    866890    "DRV_VUSB",     \

  • trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp

    r55920 r56648  
    1616 * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1717 */
     18#define LOG_GROUP LOG_GROUP_AUDIO_MIXER_BUFFER
     19#include <VBox/log.h>
    1820
    1921/*
    … …  
    3335#include <iprt/mem.h>
    3436#include <iprt/string.h> /* For RT_BZERO. */
    35 
    36 #ifdef LOG_GROUP
    37 # undef LOG_GROUP
    38 #endif
    39 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    40 #include <VBox/log.h>
    4137
    4238#ifdef TESTCASE

  • trunk/src/VBox/Devices/Audio/AudioMixer.cpp

    r55920 r56648  
    1717 * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1818 */
    19 
     19#define LOG_GROUP LOG_GROUP_AUDIO_MIXER
     20#include <VBox/log.h>
    2021#include "AudioMixer.h"
    2122#include "AudioMixBuffer.h"
    … …  
    3031#include <iprt/assert.h>
    3132#include <iprt/string.h>
    32 
    33 #ifdef LOG_GROUP
    34 # undef LOG_GROUP
    35 #endif
    36 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    37 #include <VBox/log.h>
    38 
    3933
    4034static int audioMixerUpdateSinkVolume(PAUDMIXSINK pSink, const PPDMAUDIOVOLUME pVolMaster);

  • trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

    r56512 r56648  
    1919*   Header Files                                                               *
    2020*******************************************************************************/
     21#define LOG_GROUP LOG_GROUP_DEV_AC97
     22#include <VBox/log.h>
    2123#include <VBox/vmm/pdmdev.h>
    2224#include <VBox/vmm/pdmaudioifs.h>
    … …  
    3133#include "VBoxDD.h"
    3234#include "AudioMixer.h"
    33 
    34 #ifdef LOG_GROUP
    35  #undef LOG_GROUP
    36 #endif
    37 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    38 #include <VBox/log.h>
    3935
    4036/*******************************************************************************

  • trunk/src/VBox/Devices/Audio/DevIchHda.cpp

    r56284 r56648  
    2323*   Header Files                                                               *
    2424*******************************************************************************/
     25#define LOG_GROUP LOG_GROUP_DEV_HDA
     26#include <VBox/log.h>
    2527#include <VBox/vmm/pdmdev.h>
    2628#include <VBox/vmm/pdmaudioifs.h>
    … …  
    3638#endif
    3739#include <iprt/list.h>
    38 
    39 #ifdef LOG_GROUP
    40 # undef LOG_GROUP
    41 #endif
    42 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    43 #include <VBox/log.h>
    4440
    4541#include "VBoxDD.h"

  • trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp

    r56292 r56648  
    2424*   Header Files                                                               *
    2525*******************************************************************************/
    26 //#define LOG_GROUP LOG_GROUP_DEV_AUDIO
     26#define LOG_GROUP LOG_GROUP_DEV_HDA_CODEC
    2727#include <VBox/vmm/pdmdev.h>
    2828#include <VBox/vmm/pdmaudioifs.h>

  • trunk/src/VBox/Devices/Audio/DevSB16.cpp

    r56278 r56648  
    4141 * THE SOFTWARE.
    4242 */
    43 
     43#define LOG_GROUP LOG_GROUP_DEV_SB16
     44#include <VBox/log.h>
    4445#include <iprt/assert.h>
    4546#ifdef IN_RING3
    … …  
    5354
    5455#include "VBoxDD.h"
    55 
    56 #ifdef LOG_GROUP
    57  #undef LOG_GROUP
    58 #endif
    59 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    60 #include <VBox/log.h>
    6156
    6257#include "AudioMixer.h"

  • trunk/src/VBox/Devices/Audio/DrvAudio.cpp

    r56292 r56648  
    4343 * THE SOFTWARE.
    4444 */
    45 
     45#define LOG_GROUP LOG_GROUP_DRV_AUDIO
     46#include <VBox/log.h>
    4647#include <VBox/vmm/pdm.h>
    4748#include <VBox/err.h>
    … …  
    5556#include <iprt/string.h>
    5657#include <iprt/uuid.h>
    57 
    58 #ifdef LOG_GROUP
    59 # undef LOG_GROUP
    60 #endif
    61 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    62 #include <VBox/log.h>
    6358
    6459#include "VBoxDD.h"

  • trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp

    r56292 r56648  
    4242 * THE SOFTWARE.
    4343 */
    44 
     44#define LOG_GROUP LOG_GROUP_DRV_AUDIO
     45#include <VBox/log.h>
    4546#include <iprt/asm-math.h>
    4647#include <iprt/assert.h>
    … …  
    5354#include <VBox/err.h>
    5455#include <VBox/vmm/mm.h>
    55 
    56 #ifdef LOG_GROUP
    57 # undef LOG_GROUP
    58 #endif
    59 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    60 #include <VBox/log.h>
    6156
    6257#include <ctype.h>

  • trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp

    r56645 r56648  
    4444*   Header Files                                                               *
    4545*******************************************************************************/
    46 
     46#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
     47#include <VBox/log.h>
    4748#include <iprt/alloc.h>
    4849#include <iprt/uuid.h> /* For PDMIBASE_2_PDMDRV. */
    … …  
    6061
    6162#include "VBoxDD.h"
    62 
    63 
    64 #ifdef LOG_GROUP
    65 # undef LOG_GROUP
    66 #endif
    67 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    68 #include <VBox/log.h>
    6963
    7064typedef struct ALSAAUDIOSTREAMIN

  • trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp

    r56646 r56648  
    1515 * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1616 */
     17#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
     18#include <VBox/log.h>
     19
    1720#include "DrvAudio.h"
    1821#include "AudioMixBuffer.h"
    … …  
    3134#include <AudioUnit/AudioUnit.h>
    3235#include <AudioToolbox/AudioConverter.h>
    33 
    34 #ifdef LOG_GROUP
    35 # undef LOG_GROUP
    36 #endif
    37 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    38 #include <VBox/log.h>
    3936
    4037/* TODO:

  • trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp

    r55920 r56648  
    1717 *
    1818 */
    19 
     19#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
     20#include <VBox/log.h>
    2021#include <dsound.h>
    2122
    … …  
    2627#include "DrvAudio.h"
    2728#include "VBoxDD.h"
    28 
    29 #ifdef LOG_GROUP
    30 # undef LOG_GROUP
    31 #endif
    32 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    33 #include <VBox/log.h>
    3429
    3530#define DSLOG(a) do { LogRel2(a); } while(0)

  • trunk/src/VBox/Devices/Audio/DrvHostNullAudio.cpp

    r56289 r56648  
    4141 * THE SOFTWARE.
    4242 */
     43#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
     44#include <VBox/log.h>
    4345#include "DrvAudio.h"
    4446#include "AudioMixBuffer.h"
    … …  
    4951#include <iprt/uuid.h> /* For PDMIBASE_2_PDMDRV. */
    5052#include <VBox/vmm/pdmaudioifs.h>
    51 
    52 #ifdef LOG_GROUP
    53 # undef LOG_GROUP
    54 #endif
    55 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    56 #include <VBox/log.h>
    5753
    5854typedef struct NULLAUDIOSTREAMOUT

  • trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp

    r56647 r56648  
    1616 * --------------------------------------------------------------------
    1717 */
     18#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
     19#include <VBox/log.h>
    1820#include "DrvAudio.h"
    1921#include "AudioMixBuffer.h"
    … …  
    3133#include <iprt/uuid.h> /* For PDMIBASE_2_PDMDRV. */
    3234#include <VBox/vmm/pdmaudioifs.h>
    33 
    34 #ifdef LOG_GROUP
    35 # undef LOG_GROUP
    36 #endif
    37 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    38 #include <VBox/log.h>
    39 
    4035
    4136/**

  • trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp

    r56646 r56648  
    2020*   Header Files                                                               *
    2121*******************************************************************************/
     22#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
     23#include <VBox/log.h>
    2224
    2325#include <stdio.h>
    … …  
    3840
    3941#include "VBoxDD.h"
    40 
    41 #ifdef LOG_GROUP
    42 # undef LOG_GROUP
    43 #endif
    44 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    45 #include <VBox/log.h>
    4642
    4743#define VBOX_PULSEAUDIO_MAX_LOG_REL_ERRORS 32 /** @todo Make this configurable thru driver options. */

  • trunk/src/VBox/Devices/Audio/alsa_stubs.c

    r56292 r56648  
    1515 * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1616 */
    17 
     17#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
    1818#include <iprt/assert.h>
    1919#include <iprt/ldr.h>
    20 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    2120#include <VBox/log.h>
    2221#include <VBox/err.h>

  • trunk/src/VBox/Devices/Audio/pulse_stubs.c

    r56292 r56648  
    1515 * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1616 */
    17 
     17#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
    1818#include <iprt/assert.h>
    1919#include <iprt/ldr.h>
    20 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    2120#include <VBox/log.h>
    2221#include <VBox/err.h>

  • trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp

    r55921 r56648  
    2020*   Header Files                                                               *
    2121*******************************************************************************/
     22#define LOG_GROUP LOG_GROUP_DRV_VRDE_AUDIO
     23#include <VBox/log.h>
    2224#include "DrvAudioVRDE.h"
    2325#include "ConsoleImpl.h"
    … …  
    3840#include <VBox/vmm/cfgm.h>
    3941#include <VBox/err.h>
    40 
    41 #undef LOG_GROUP
    42 #define LOG_GROUP LOG_GROUP_DEV_AUDIO
    43 #include <VBox/log.h>
    44 
    4542
    4643/*******************************************************************************

  • trunk/src/VBox/Runtime/VBox/log-vbox.cpp

    r56290 r56648  
    206206    do { if (strcmp(g_apszGroups[def], str)) {printf("%s='%s' expects '%s'\n", #def, g_apszGroups[def], str); RTAssertDoPanic(); } } while (0)
    207207    ASSERT_LOG_GROUP(DEFAULT);
     208    ASSERT_LOG_GROUP(AUDIO_MIXER);
     209    ASSERT_LOG_GROUP(AUDIO_MIXER_BUFFER);
    208210    ASSERT_LOG_GROUP(CFGM);
    209211    ASSERT_LOG_GROUP(CPUM);
    … …  
    213215    ASSERT_LOG_GROUP(DBGF_INFO);
    214216    ASSERT_LOG_GROUP(DEV);
     217    ASSERT_LOG_GROUP(DEV_AC97);
    215218    ASSERT_LOG_GROUP(DEV_ACPI);
    216219    ASSERT_LOG_GROUP(DEV_APIC);
    217     ASSERT_LOG_GROUP(DEV_AUDIO);
    218220    ASSERT_LOG_GROUP(DEV_FDC);
     221    ASSERT_LOG_GROUP(DEV_HDA);
     222    ASSERT_LOG_GROUP(DEV_HDA_CODEC);
    219223    ASSERT_LOG_GROUP(DEV_HPET);
    220224    ASSERT_LOG_GROUP(DEV_IDE);
    … …  
    230234    ASSERT_LOG_GROUP(DEV_PIT);
    231235    ASSERT_LOG_GROUP(DEV_RTC);
     236    ASSERT_LOG_GROUP(DEV_SB16);
    232237    ASSERT_LOG_GROUP(DEV_SERIAL);
    233238    ASSERT_LOG_GROUP(DEV_SMC);
    … …  
    238243    ASSERT_LOG_GROUP(DRV);
    239244    ASSERT_LOG_GROUP(DRV_ACPI);
     245    ASSERT_LOG_GROUP(DRV_AUDIO);
    240246    ASSERT_LOG_GROUP(DRV_BLOCK);
    241247    ASSERT_LOG_GROUP(DRV_FLOPPY);
     248    ASSERT_LOG_GROUP(DRV_HOST_AUDIO);
    242249    ASSERT_LOG_GROUP(DRV_HOST_DVD);
    243250    ASSERT_LOG_GROUP(DRV_HOST_FLOPPY);
    … …  
    250257    ASSERT_LOG_GROUP(DRV_USBPROXY);
    251258    ASSERT_LOG_GROUP(DRV_VBOXHDD);
     259    ASSERT_LOG_GROUP(DRV_VRDE_AUDIO);
    252260    ASSERT_LOG_GROUP(DRV_VSWITCH);
    253261    ASSERT_LOG_GROUP(DRV_VUSB);
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette