branch | RCL_3 |
changeset 23 | 26645d81f48d |
parent 0 | 08ec8eefde2f |
child 24 | cc28652e0254 |
21:28839de615b4 | 23:26645d81f48d |
---|---|
101 break; |
101 break; |
102 } |
102 } |
103 } |
103 } |
104 } |
104 } |
105 CClearConfig configIni; |
105 CClearConfig configIni; |
106 configIni.Clear(logger); |
106 configIni.ClearL(logger); |
107 INFO_PRINTF2(_L("connect err %d"), result); |
107 INFO_PRINTF2(_L("connect err %d"), result); |
108 result=logger.SetPrimaryFiltersEnabled(*setfilter,ETrue);//C.A. previously:result=logger.EnableClassifications(*setfilter); |
108 result=logger.SetPrimaryFiltersEnabled(*setfilter,ETrue);//C.A. previously:result=logger.EnableClassifications(*setfilter); |
109 |
109 |
110 if(result==KErrNone) |
110 if(result==KErrNone) |
111 INFO_PRINTF2(_L("Primary filter has been set with single filter, %d, check log"), setfilter->At(0)); |
111 INFO_PRINTF2(_L("Primary filter has been set with single filter, %d, check log"), setfilter->At(0)); |
318 } |
318 } |
319 } |
319 } |
320 |
320 |
321 // ************** Block end **************** |
321 // ************** Block end **************** |
322 |
322 |
323 configIni.Clear(logger); |
323 configIni.ClearL(logger); |
324 logger.Close(); |
324 logger.Close(); |
325 if(setfilter) |
325 if(setfilter) |
326 delete setfilter; |
326 delete setfilter; |
327 if(getfilter) |
327 if(getfilter) |
328 delete getfilter; |
328 delete getfilter; |
412 } |
412 } |
413 } |
413 } |
414 } |
414 } |
415 |
415 |
416 CClearConfig configIni; |
416 CClearConfig configIni; |
417 configIni.Clear(logger); |
417 configIni.ClearL(logger); |
418 result = logger.SetSecondaryFiltersEnabled(setfilter,ETrue);//C.A. previously:result = logger.EnableModuleUids(setfilter); |
418 result = logger.SetSecondaryFiltersEnabled(setfilter,ETrue);//C.A. previously:result = logger.EnableModuleUids(setfilter); |
419 INFO_PRINTF2(_L("Secondary filter has been set with single filter, %d, check log"), setfilter[0]); |
419 INFO_PRINTF2(_L("Secondary filter has been set with single filter, %d, check log"), setfilter[0]); |
420 INFO_PRINTF2(_L("code: %d"), result); |
420 INFO_PRINTF2(_L("code: %d"), result); |
421 |
421 |
422 |
422 |
598 result=0; |
598 result=0; |
599 } |
599 } |
600 } |
600 } |
601 } |
601 } |
602 INFO_PRINTF1(_L("Now call clear config to check removing multiple second filters performance")); |
602 INFO_PRINTF1(_L("Now call clear config to check removing multiple second filters performance")); |
603 configIni.Clear(logger); |
603 configIni.ClearL(logger); |
604 INFO_PRINTF1(_L("after clear config- multiple second filters performance")); |
604 INFO_PRINTF1(_L("after clear config- multiple second filters performance")); |
605 |
605 |
606 if(result==1) |
606 if(result==1) |
607 SetBlockResult(EFail); |
607 SetBlockResult(EFail); |
608 else |
608 else |
692 INFO_PRINTF2(_L("Logger start returning incorrect error code of %d when already started by SysStart, should be KErrInUse (-14)"), SysStartResult); |
692 INFO_PRINTF2(_L("Logger start returning incorrect error code of %d when already started by SysStart, should be KErrInUse (-14)"), SysStartResult); |
693 logger.StopOutputting(); |
693 logger.StopOutputting(); |
694 #endif |
694 #endif |
695 #ifndef SysStartTest |
695 #ifndef SysStartTest |
696 CClearConfig configIni; |
696 CClearConfig configIni; |
697 configIni.Clear(logger); |
697 configIni.ClearL(logger); |
698 #endif |
698 #endif |
699 CArrayFixFlat<TUint8> *setprimfilter = new (ELeave)CArrayFixFlat<TUint8>(22); |
699 CArrayFixFlat<TUint8> *setprimfilter = new (ELeave)CArrayFixFlat<TUint8>(22); |
700 setprimfilter->AppendL(KGroupId); |
700 setprimfilter->AppendL(KGroupId); |
701 setprimfilter->AppendL(TRACE_PERFORMANCE); |
701 setprimfilter->AppendL(TRACE_PERFORMANCE); |
702 setprimfilter->AppendL(TRACE_STATE); |
702 setprimfilter->AppendL(TRACE_STATE); |
991 #endif |
991 #endif |
992 if(BlockResult()==EPass) |
992 if(BlockResult()==EPass) |
993 { |
993 { |
994 INFO_PRINTF1(_L("Now do some multiple type logging testing.")); |
994 INFO_PRINTF1(_L("Now do some multiple type logging testing.")); |
995 //CClearConfig configIni; |
995 //CClearConfig configIni; |
996 //configIni.Clear(logger); |
996 //configIni.ClearL(logger); |
997 |
997 |
998 if(result==0) |
998 if(result==0) |
999 { |
999 { |
1000 INFO_PRINTF1(_L("file set as output plugin ok")); |
1000 INFO_PRINTF1(_L("file set as output plugin ok")); |
1001 _LIT8(KTextmedia,"uloggerfileplugin"); |
1001 _LIT8(KTextmedia,"uloggerfileplugin"); |
1203 { |
1203 { |
1204 delete(multsetprimfilter); |
1204 delete(multsetprimfilter); |
1205 multsetprimfilter=NULL; |
1205 multsetprimfilter=NULL; |
1206 } |
1206 } |
1207 } |
1207 } |
1208 configIni.Clear(logger); |
1208 configIni.ClearL(logger); |
1209 } |
1209 } |
1210 else |
1210 else |
1211 INFO_PRINTF1(_L("adding file as output plugin failed")); |
1211 INFO_PRINTF1(_L("adding file as output plugin failed")); |
1212 if(result==0&&BlockResult()==EPass) |
1212 if(result==0&&BlockResult()==EPass) |
1213 SetBlockResult(EPass); |
1213 SetBlockResult(EPass); |
1308 break; |
1308 break; |
1309 } |
1309 } |
1310 } |
1310 } |
1311 } |
1311 } |
1312 CClearConfig configIni; |
1312 CClearConfig configIni; |
1313 configIni.Clear(logger); |
1313 configIni.ClearL(logger); |
1314 CArrayFixFlat<TUint8> *setprimfilter = new (ELeave)CArrayFixFlat<TUint8>(1); |
1314 CArrayFixFlat<TUint8> *setprimfilter = new (ELeave)CArrayFixFlat<TUint8>(1); |
1315 setprimfilter->AppendL(KGroupId); |
1315 setprimfilter->AppendL(KGroupId); |
1316 RArray<TUint32> setsecondfilter; |
1316 RArray<TUint32> setsecondfilter; |
1317 setsecondfilter.Append((TUint32) KComponentId); |
1317 setsecondfilter.Append((TUint32) KComponentId); |
1318 logger.SetPrimaryFiltersEnabled(*setprimfilter,ETrue);//C.A. previously:logger.EnableClassifications(*setprimfilter); |
1318 logger.SetPrimaryFiltersEnabled(*setprimfilter,ETrue);//C.A. previously:logger.EnableClassifications(*setprimfilter); |
1578 if(result==0&&BlockResult()==EPass) |
1578 if(result==0&&BlockResult()==EPass) |
1579 SetBlockResult(EPass); |
1579 SetBlockResult(EPass); |
1580 else |
1580 else |
1581 SetBlockResult(EFail); |
1581 SetBlockResult(EFail); |
1582 INFO_PRINTF1(_L("Multiple logging to file with kernel side tracing has been tested - check output log. It should contain four lines of tracing of type, (sec,prim), (sec+2, prim), (sec, prim+2), (sec+2, prim+2)")); |
1582 INFO_PRINTF1(_L("Multiple logging to file with kernel side tracing has been tested - check output log. It should contain four lines of tracing of type, (sec,prim), (sec+2, prim), (sec, prim+2), (sec+2, prim+2)")); |
1583 configIni.Clear(logger); |
1583 configIni.ClearL(logger); |
1584 } |
1584 } |
1585 if(setprimfilter) |
1585 if(setprimfilter) |
1586 { |
1586 { |
1587 delete(setprimfilter); |
1587 delete(setprimfilter); |
1588 setprimfilter=NULL; |
1588 setprimfilter=NULL; |
1666 break; |
1666 break; |
1667 } |
1667 } |
1668 } |
1668 } |
1669 } |
1669 } |
1670 CClearConfig configIni; |
1670 CClearConfig configIni; |
1671 configIni.Clear(logger); |
1671 configIni.ClearL(logger); |
1672 CArrayFixFlat<TUint8> *setprimfilter = new (ELeave)CArrayFixFlat<TUint8>(1); |
1672 CArrayFixFlat<TUint8> *setprimfilter = new (ELeave)CArrayFixFlat<TUint8>(1); |
1673 setprimfilter->AppendL(KGroupId); |
1673 setprimfilter->AppendL(KGroupId); |
1674 RArray<TUint32> setsecondfilter; |
1674 RArray<TUint32> setsecondfilter; |
1675 setsecondfilter.Append((TUint32) KComponentId); |
1675 setsecondfilter.Append((TUint32) KComponentId); |
1676 result = logger.SetPrimaryFiltersEnabled(*setprimfilter,ETrue);//C.A. previously:logger.EnableClassifications(*setprimfilter); |
1676 result = logger.SetPrimaryFiltersEnabled(*setprimfilter,ETrue);//C.A. previously:logger.EnableClassifications(*setprimfilter); |
1883 break; |
1883 break; |
1884 } |
1884 } |
1885 } |
1885 } |
1886 } |
1886 } |
1887 |
1887 |
1888 configIni.Clear(logger); |
1888 configIni.ClearL(logger); |
1889 CArrayFixFlat<TUint8> *setprimfilter = new (ELeave)CArrayFixFlat<TUint8>(1); |
1889 CArrayFixFlat<TUint8> *setprimfilter = new (ELeave)CArrayFixFlat<TUint8>(1); |
1890 setprimfilter->AppendL(KGroupId); |
1890 setprimfilter->AppendL(KGroupId); |
1891 RArray<TUint32> setsecondfilter; |
1891 RArray<TUint32> setsecondfilter; |
1892 setsecondfilter.Append((TUint32) KComponentId); |
1892 setsecondfilter.Append((TUint32) KComponentId); |
1893 logger.SetPrimaryFiltersEnabled(*setprimfilter,ETrue);//C.A. previously:logger.EnableClassifications(*setprimfilter); |
1893 logger.SetPrimaryFiltersEnabled(*setprimfilter,ETrue);//C.A. previously:logger.EnableClassifications(*setprimfilter); |
1975 SetBlockResult(EPass); |
1975 SetBlockResult(EPass); |
1976 else |
1976 else |
1977 SetBlockResult(EFail); |
1977 SetBlockResult(EFail); |
1978 INFO_PRINTF1(_L("Simple printf logging to file has been tested with kernel side tracing- check output log")); |
1978 INFO_PRINTF1(_L("Simple printf logging to file has been tested with kernel side tracing- check output log")); |
1979 |
1979 |
1980 configIni.Clear(logger); |
1980 configIni.ClearL(logger); |
1981 |
1981 |
1982 if(setprimfilter) |
1982 if(setprimfilter) |
1983 { |
1983 { |
1984 delete(setprimfilter); |
1984 delete(setprimfilter); |
1985 setprimfilter=NULL; |
1985 setprimfilter=NULL; |