Binary file commsfwsupport/commselements/NetMeta/doc_pub/NetMeta_Design_Document.doc has changed
--- a/commsfwsupport/commselements/NetSubscribe/documentation/NetSubscribe.mdl Fri Sep 17 08:36:26 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1149 +0,0 @@
-
-(object Petal
- version 43
- _written "Rose 6.5.9232.10"
- charSet 0)
-
-(object Design "Logical View"
- is_unit TRUE
- is_loaded TRUE
- quid "41C0741F00F9"
- defaults (object defaults
- rightMargin 0.250000
- leftMargin 0.250000
- topMargin 0.250000
- bottomMargin 0.500000
- pageOverlap 0.250000
- clipIconLabels TRUE
- autoResize TRUE
- snapToGrid TRUE
- gridX 16
- gridY 16
- defaultFont (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- showMessageNum 1
- showClassOfObject TRUE
- notation "Unified")
- root_usecase_package (object Class_Category "Use Case View"
- quid "41C0741F00FB"
- exportControl "Public"
- global TRUE
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object UseCaseDiagram "Main"
- quid "41C0741F0102"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- root_category (object Class_Category "Logical View"
- quid "41C0741F00FA"
- exportControl "Public"
- global TRUE
- subsystem "Component View"
- quidu "41C0741F00FC"
- logical_models (list unit_reference_list
- (object Class "CNetSubscribe"
- quid "41C074240261"
- operations (list Operations
- (object Operation "NewL (transport id)"
- quid "41C07445001E"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "RegisterNewSignalL(TEventClientData, SSignalId)"
- quid "41C0747E037A"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "ReregisterSignalL(TEventClientData, SSignalId)"
- quid "41C07488037A"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "DeRegisterSignal(TEventBase)"
- quid "41C0749000BB"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)))
- (object Class "XSignal"
- quid "41C0785A009B"
- operations (list Operations
- (object Operation "DeRegisterClient(TEventBase*)"
- quid "41C17110039E"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "RegisterClientL(TEventClientData&)"
- quid "41C1711B0207"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0))
- class_attributes (list class_attribute_list
- (object ClassAttribute "sSignalId"
- quid "41C16E6102FB")))
- (object Class "NewInterface"
- quid "41C07860034B"
- stereotype "Interface")
- (object Class "TEventClientData"
- quid "41C078D60232"
- operations (list Operations
- (object Operation "SignalL(SMetaData*)"
- quid "41C0790903B8"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "SignalError(errCode)"
- quid "41C0791A03B8"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)))
- (object Class "TEventBase"
- quid "41C0796E03B8")
- (object Class "TEventDataArray"
- quid "41C0799300CA"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41C079EA02DE"
- supplier "Logical View::RArray<TEventClientData>"
- quidu "41C079BC009B"))
- operations (list Operations
- (object Operation "Find(TEventBase*)"
- quid "41C07A0300BB"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "RegisterL(TEventClientData&)"
- quid "41C07A13035B"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "DeRegister(TEventBase*)"
- quid "41C07A2B01D4"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "DispatchL(SMetaData*, int)"
- quid "41C07A3D006D"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)))
- (object Class "RArray<TEventClientData>"
- quid "41C079BC009B")
- (object Class "XEvenddddt"
- quid "41C07A6D003E"
- operations (list Operations
- (object Operation "DeRegisterClient(TEventBase*)"
- quid "41C07A77034B"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "RegisterClientL( TEventClientData&)"
- quid "41C07A800176"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0))
- class_attributes (list class_attribute_list
- (object ClassAttribute "const SSignalId iSignalId"
- quid "41C07A92009B")))
- (object Class "CSignalActive"
- quid "41C07B0E034B"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41C07B180232"
- supplier "Logical View::XSignal"
- quidu "41C0785A009B")
- (object Inheritance_Relationship
- quid "41C07B2A0212"
- supplier "Logical View::CActive"
- quidu "41C07B1D0186"))
- operations (list Operations
- (object Operation "RunError(TInt)"
- quid "41C07BC20212"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)))
- (object Class "CActive"
- quid "41C07B1D0186")
- (object Class "TEvent"
- quid "41C07C490128"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41C07C5A02DE"
- supplier "Logical View::TEventBase"
- quidu "41C0796E03B8"))
- operations (list Operations
- (object Operation "SubscribeL(CNetSubscribe&, SSignalId)"
- quid "41C07C9001B5"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "Cancel(CNetSubscribe&)"
- quid "41C07D0201B5"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0))
- class_attributes (list class_attribute_list
- (object ClassAttribute "iHandler"
- quid "41C07C9D02AF"
- type "TSignalCallback")
- (object ClassAttribute "iErrHandler"
- quid "41C07CB2001E"
- type "TSignalErrorCallback")
- (object ClassAttribute "iThis"
- quid "41C07CC7007C"
- type "TAny*")))
- (object Class "CPSSignal"
- quid "41C169D80230"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41C169E70165"
- supplier "Logical View::CSignalActive"
- quidu "41C07B0E034B"))
- operations (list Operations
- (object Operation "RunL"
- quid "41C171B2014C"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "DoCancel"
- quid "41C171B602D3"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0))
- class_attributes (list class_attribute_list
- (object ClassAttribute "iProperty"
- quid "41C1718E0217"
- type "RProperty")))
- (object Class "CPSSubscribe"
- quid "41C169EA028E"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41C169F40369"
- supplier "Logical View::CNetSubscribe"
- quidu "41C074240261"))
- operations (list Operations
- (object Operation "RegisterNewSignalL"
- quid "41C19FB00294"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "ReregisterSignalL"
- quid "41C19FB70256"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "DeRegisterSignal"
- quid "41C19FBF00BF"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "Signal(TInt)"
- quid "41C1A0AE01D9"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)))
- (object Class "DHCPSignal"
- quid "41C2A9650204")
- (object Class "CMQSubscribe"
- quid "41C853AC01A4"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41C8541800AA"
- supplier "Logical View::CNetSubscribe"
- quidu "41C074240261")))
- (object Class "CMQSignal"
- quid "41C853B80221"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41C8541502CC"
- supplier "Logical View::CSignalActive"
- quidu "41C07B0E034B")))
- (object Class "TEventInt"
- quid "41C855A00117"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41C855DE01E2"
- supplier "Logical View::TEventBase"
- quidu "41C0796E03B8")))
- (object Class "TEventBuf"
- quid "41C855C2025F"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "41C855DB026F"
- supplier "Logical View::TEventBase"
- quidu "41C0796E03B8")))
- (object Association "$UNNAMED$0"
- quid "41C078650118"
- roles (list role_list
- (object Role "$UNNAMED$1"
- quid "41C07866009B"
- supplier "Logical View::XSignal"
- quidu "41C0785A009B"
- client_cardinality (value cardinality "0..n")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "$UNNAMED$2"
- quid "41C07866009C"
- supplier "Logical View::CNetSubscribe"
- quidu "41C074240261"
- Containment "By Reference"
- is_aggregate TRUE)))
- (object Association "$UNNAMED$3"
- quid "41C0797B03E7"
- roles (list role_list
- (object Role "$UNNAMED$4"
- quid "41C0797C0241"
- supplier "Logical View::TEventBase"
- quidu "41C0796E03B8"
- is_navigable TRUE)
- (object Role "$UNNAMED$5"
- quid "41C0797C0242"
- supplier "Logical View::TEventClientData"
- quidu "41C078D60232"
- is_navigable TRUE
- is_aggregate TRUE)))
- (object Association "$UNNAMED$6"
- quid "41C079D0001E"
- roles (list role_list
- (object Role "$UNNAMED$7"
- quid "41C079D001A5"
- supplier "Logical View::TEventClientData"
- quidu "41C078D60232"
- is_navigable TRUE)
- (object Role "$UNNAMED$8"
- quid "41C079D001A6"
- supplier "Logical View::RArray<TEventClientData>"
- quidu "41C079BC009B"
- is_navigable TRUE
- is_aggregate TRUE)))
- (object Association "$UNNAMED$9"
- quid "41C07AB401A5"
- roles (list role_list
- (object Role "$UNNAMED$10"
- quid "41C07AB4031C"
- supplier "Logical View::TEventDataArray"
- quidu "41C0799300CA"
- client_cardinality (value cardinality "1")
- is_navigable TRUE)
- (object Role "$UNNAMED$11"
- quid "41C07AB4031D"
- supplier "Logical View::XEvenddddt"
- quidu "41C07A6D003E"
- is_navigable TRUE
- is_aggregate TRUE)))
- (object Association "$UNNAMED$12"
- quid "41C07B25034B"
- roles (list role_list
- (object Role "$UNNAMED$13"
- quid "41C07B260118"
- supplier "Logical View::CActive"
- quidu "41C07B1D0186"
- is_navigable TRUE)
- (object Role "$UNNAMED$14"
- quid "41C07B260119"
- supplier "Logical View::CSignalActive"
- quidu "41C07B0E034B"
- is_navigable TRUE
- is_aggregate TRUE)))
- (object Association "$UNNAMED$15"
- quid "41C169370221"
- roles (list role_list
- (object Role "$UNNAMED$16"
- quid "41C1693703D6"
- supplier "Logical View::TEventClientData"
- quidu "41C078D60232"
- client_cardinality (value cardinality "0..n")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "$UNNAMED$17"
- quid "41C1693703E6"
- supplier "Logical View::TEventDataArray"
- quidu "41C0799300CA"
- Containment "By Reference"
- is_aggregate TRUE)))
- (object Association "$UNNAMED$18"
- quid "41C16DF900F8"
- roles (list role_list
- (object Role "$UNNAMED$19"
- quid "41C16DFD027E"
- supplier "Logical View::TEventBase"
- quidu "41C0796E03B8"
- is_navigable TRUE)
- (object Role "$UNNAMED$20"
- quid "41C16DFD027F"
- supplier "Logical View::TEventClientData"
- quidu "41C078D60232")))
- (object Association "$UNNAMED$21"
- quid "41C16E6C0211"
- roles (list role_list
- (object Role "$UNNAMED$22"
- quid "41C16E6D00D8"
- supplier "Logical View::TEventClientData"
- quidu "41C078D60232"
- is_navigable TRUE)
- (object Role "$UNNAMED$23"
- quid "41C16E6D00D9"
- supplier "Logical View::XSignal"
- quidu "41C0785A009B"
- is_navigable TRUE
- is_aggregate TRUE)))
- (object Association "$UNNAMED$24"
- quid "41C170D20004"
- roles (list role_list
- (object Role "$UNNAMED$25"
- quid "41C170D202F2"
- supplier "Logical View::TEventDataArray"
- quidu "41C0799300CA"
- is_navigable TRUE)
- (object Role "$UNNAMED$26"
- quid "41C170D202F3"
- supplier "Logical View::XSignal"
- quidu "41C0785A009B"))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Main"
- quid "41C0741F0100"
- title "Main"
- zoom 60
- max_height 28350
- max_width 21600
- origin_x 581
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::CSignalActive" @1
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1360, 1920)
- label (object ItemLabel
- Parent_View @1
- location (1206, 1844)
- fill_color 13434879
- nlines 1
- max_width 308
- justify 0
- label "CSignalActive")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C07B0E034B"
- compartment (object Compartment
- Parent_View @1
- location (1206, 1902)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 2
- max_width 2578)
- width 326
- height 174
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::CActive" @2
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1264, 1648)
- label (object ItemLabel
- Parent_View @2
- location (1181, 1602)
- fill_color 13434879
- nlines 1
- max_width 166
- justify 0
- label "CActive")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C07B1D0186"
- width 184
- height 114
- annotation 8
- autoResize TRUE)
- (object InheritView "" @3
- stereotype TRUE
- line_color 3342489
- quidu "41C07B2A0212"
- client @1
- supplier @2
- line_style 0)
- (object ClassView "Class" "Logical View::CPSSignal" @4
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (592, 2080)
- label (object ItemLabel
- Parent_View @4
- location (398, 1957)
- fill_color 13434879
- nlines 1
- max_width 388
- justify 0
- label "CPSSignal")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C169D80230"
- compartment (object Compartment
- Parent_View @4
- location (398, 2015)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 4
- max_width 3350)
- width 406
- height 268
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::CPSSubscribe" @5
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (576, 1088)
- label (object ItemLabel
- Parent_View @5
- location (372, 941)
- fill_color 13434879
- nlines 1
- max_width 408
- justify 0
- label "CPSSubscribe")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C169EA028E"
- compartment (object Compartment
- Parent_View @5
- location (372, 995)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 5
- max_width 4634)
- width 426
- height 316
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::CNetSubscribe" @6
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1648, 880)
- label (object ItemLabel
- Parent_View @6
- location (1211, 733)
- fill_color 13434879
- nlines 1
- max_width 874
- justify 0
- label "CNetSubscribe")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C074240261"
- compartment (object Compartment
- Parent_View @6
- location (1211, 791)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 5
- max_width 10477)
- width 892
- height 316
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::TEventDataArray" @7
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2384, 2048)
- label (object ItemLabel
- Parent_View @7
- location (2106, 1901)
- fill_color 13434879
- nlines 1
- max_width 556
- justify 0
- label "TEventDataArray")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C0799300CA"
- compartment (object Compartment
- Parent_View @7
- location (2106, 1955)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 5
- max_width 6582)
- width 574
- height 316
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::XSignal" @8
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1664, 1360)
- label (object ItemLabel
- Parent_View @8
- location (1347, 1237)
- fill_color 13434879
- nlines 1
- max_width 634
- justify 0
- label "XSignal")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C0785A009B"
- compartment (object Compartment
- Parent_View @8
- location (1347, 1295)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 4
- max_width 5632)
- width 652
- height 268
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$0" @9
- location (1656, 1131)
- stereotype TRUE
- line_color 3342489
- quidu "41C078650118"
- roleview_list (list RoleViews
- (object RoleView "$UNNAMED$1" @10
- Parent_View @9
- location (920, 379)
- stereotype TRUE
- line_color 3342489
- quidu "41C07866009B"
- client @9
- supplier @8
- line_style 0
- label (object SegLabel @11
- Parent_View @10
- location (1625, 1205)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..*"
- pctDist 0.775579
- height 34
- orientation 1))
- (object RoleView "$UNNAMED$2" @12
- Parent_View @9
- location (920, 379)
- stereotype TRUE
- line_color 3342489
- quidu "41C07866009C"
- client @9
- supplier @6
- line_style 0)))
- (object InheritView "" @13
- stereotype TRUE
- line_color 3342489
- quidu "41C07B180232"
- client @1
- supplier @8
- line_style 0)
- (object AssociationViewNew "$UNNAMED$24" @14
- location (2011, 1691)
- stereotype TRUE
- line_color 3342489
- quidu "41C170D20004"
- roleview_list (list RoleViews
- (object RoleView "$UNNAMED$25" @15
- Parent_View @14
- location (1323, 779)
- stereotype TRUE
- line_color 3342489
- quidu "41C170D202F2"
- client @14
- supplier @7
- line_style 0)
- (object RoleView "$UNNAMED$26" @16
- Parent_View @14
- location (1323, 779)
- stereotype TRUE
- line_color 3342489
- quidu "41C170D202F3"
- client @14
- supplier @8
- line_style 0)))
- (object ClassView "Class" "Logical View::TEvent" @17
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2560, 672)
- label (object ItemLabel
- Parent_View @17
- location (2198, 502)
- fill_color 13434879
- nlines 1
- max_width 724
- justify 0
- label "TEvent")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C07C490128"
- compartment (object Compartment
- Parent_View @17
- location (2198, 560)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 6
- max_width 8530)
- width 742
- height 362
- annotation 8
- autoResize TRUE)
- (object InheritView "" @18
- stereotype TRUE
- line_color 3342489
- quidu "41C169F40369"
- client @5
- supplier @6
- line_style 0)
- (object ClassView "Class" "Logical View::CMQSubscribe" @19
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (592, 1360)
- label (object ItemLabel
- Parent_View @19
- location (433, 1312)
- fill_color 13434879
- nlines 1
- max_width 318
- justify 0
- label "CMQSubscribe")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C853AC01A4"
- width 336
- height 118
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::CMQSignal" @20
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (608, 2384)
- label (object ItemLabel
- Parent_View @20
- location (489, 2336)
- fill_color 13434879
- nlines 1
- max_width 238
- justify 0
- label "CMQSignal")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C853B80221"
- width 256
- height 118
- annotation 8
- autoResize TRUE)
- (object InheritView "" @21
- stereotype TRUE
- line_color 3342489
- quidu "41C8541800AA"
- client @19
- supplier @6
- vertices (list Points
- (760, 1334)
- (926, 1311)
- (989, 1007)
- (1201, 965))
- line_style 0)
- (object InheritView "" @22
- stereotype TRUE
- line_color 3342489
- quidu "41C169E70165"
- client @4
- supplier @1
- line_style 0)
- (object InheritView "" @23
- stereotype TRUE
- line_color 3342489
- quidu "41C8541502CC"
- client @20
- supplier @1
- vertices (list Points
- (731, 2324)
- (879, 2254)
- (909, 2014)
- (1196, 1953))
- line_style 0)
- (object ClassView "Class" "Logical View::TEventInt" @24
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (3088, 560)
- label (object ItemLabel
- Parent_View @24
- location (2990, 514)
- fill_color 13434879
- nlines 1
- max_width 196
- justify 0
- label "TEventInt")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C855A00117"
- width 214
- height 118
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::TEventBase" @25
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2656, 1184)
- label (object ItemLabel
- Parent_View @25
- location (2531, 1136)
- fill_color 13434879
- nlines 1
- max_width 250
- justify 0
- label "TEventBase")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C0796E03B8"
- width 268
- height 118
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::TEventClientData" @26
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2448, 1552)
- label (object ItemLabel
- Parent_View @26
- location (2240, 1452)
- fill_color 13434879
- nlines 1
- max_width 416
- justify 0
- label "TEventClientData")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C078D60232"
- compartment (object Compartment
- Parent_View @26
- location (2240, 1506)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 3
- max_width 4836)
- width 434
- height 222
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$15" @27
- location (2418, 1776)
- stereotype TRUE
- line_color 3342489
- quidu "41C169370221"
- roleview_list (list RoleViews
- (object RoleView "$UNNAMED$16" @28
- Parent_View @27
- location (546, 112)
- stereotype TRUE
- line_color 3342489
- quidu "41C1693703D6"
- client @27
- supplier @26
- line_style 0
- label (object SegLabel @29
- Parent_View @28
- location (2475, 1698)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..*"
- pctDist 0.752809
- height 46
- orientation 1))
- (object RoleView "$UNNAMED$17" @30
- Parent_View @27
- location (546, 112)
- stereotype TRUE
- line_color 3342489
- quidu "41C1693703E6"
- client @27
- supplier @7
- line_style 0)))
- (object AssociationViewNew "$UNNAMED$18" @31
- location (2565, 1341)
- stereotype TRUE
- line_color 3342489
- quidu "41C16DF900F8"
- roleview_list (list RoleViews
- (object RoleView "$UNNAMED$19" @32
- Parent_View @31
- location (677, 317)
- stereotype TRUE
- line_color 3342489
- quidu "41C16DFD027E"
- client @31
- supplier @25
- line_style 0)
- (object RoleView "$UNNAMED$20" @33
- Parent_View @31
- location (677, 317)
- stereotype TRUE
- line_color 3342489
- quidu "41C16DFD027F"
- client @31
- supplier @26
- line_style 0)))
- (object ClassView "Class" "Logical View::TEventBuf" @34
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2960, 400)
- label (object ItemLabel
- Parent_View @34
- location (2855, 354)
- fill_color 13434879
- nlines 1
- max_width 210
- justify 0
- label "TEventBuf")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41C855C2025F"
- width 228
- height 118
- annotation 8
- autoResize TRUE)
- (object InheritView "" @35
- stereotype TRUE
- line_color 3342489
- quidu "41C07C5A02DE"
- client @17
- supplier @25
- vertices (list Points
- (2554, 853)
- (2553, 941)
- (2650, 941)
- (2654, 1124))
- line_style 0)
- (object InheritView "" @36
- stereotype TRUE
- line_color 3342489
- quidu "41C855DB026F"
- client @34
- supplier @25
- vertices (list Points
- (2959, 459)
- (2954, 942)
- (2650, 942)
- (2654, 1124))
- line_style 0)
- (object InheritView "" @37
- stereotype TRUE
- line_color 3342489
- quidu "41C855DE01E2"
- client @24
- supplier @25
- vertices (list Points
- (3085, 619)
- (3079, 942)
- (2650, 942)
- (2654, 1124))
- line_style 0)))
- (object ClassDiagram "NewDiagram"
- quid "41C7F8A50154"
- title "NewDiagram"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- root_subsystem (object SubSystem "Component View"
- quid "41C0741F00FC"
- physical_models (list unit_reference_list)
- physical_presentations (list unit_reference_list
- (object Module_Diagram "Main"
- quid "41C0741F0101"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- process_structure (object Processes
- quid "41C0741F00FD"
- ProcsNDevs (list
- (object Process_Diagram "Deployment View"
- quid "41C0741F00FF"
- title "Deployment View"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- properties (object Properties
- attributes (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "DDL"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "DDL"
- name "DataBase"
- value ("DataBaseSet" 800))
- (object Attribute
- tool "DDL"
- name "DataBaseSet"
- value (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "ANSI"
- value 800)
- (object Attribute
- tool "DDL"
- name "Oracle"
- value 801)
- (object Attribute
- tool "DDL"
- name "SQLServer"
- value 802)
- (object Attribute
- tool "DDL"
- name "Sybase"
- value 803)
- (object Attribute
- tool "DDL"
- name "Watcom"
- value 804)))
- (object Attribute
- tool "DDL"
- name "PrimaryKeyColumnName"
- value "Id")
- (object Attribute
- tool "DDL"
- name "PrimaryKeyColumnType"
- value "NUMBER(5)")
- (object Attribute
- tool "DDL"
- name "ViewName"
- value "V_")
- (object Attribute
- tool "DDL"
- name "TableName"
- value "T_")
- (object Attribute
- tool "DDL"
- name "InheritSuffix"
- value "_V")
- (object Attribute
- tool "DDL"
- name "DropClause"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "BaseViews"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "DDLScriptFilename"
- value "DDL1.SQL")))
- (object Attribute
- tool "DDL"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "DDL"
- name "ColumnType"
- value "VARCHAR")
- (object Attribute
- tool "DDL"
- name "Length"
- value "")
- (object Attribute
- tool "DDL"
- name "NullsOK"
- value TRUE)
- (object Attribute
- tool "DDL"
- name "PrimaryKey"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "Unique"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "CompositeUnique"
- value FALSE)
- (object Attribute
- tool "DDL"
- name "CheckConstraint"
- value "")))
- (object Attribute
- tool "DDL"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "RequisitePro"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Model Integrator"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Web Publisher"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Version Control"
- name "HiddenTool"
- value FALSE))
- quid "41C0741F00FE"))
--- a/commsfwsupport/commselements/commsfw/bwins/commsfwu.def Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/commsfw/bwins/commsfwu.def Mon Oct 04 02:21:43 2010 +0300
@@ -26,8 +26,8 @@
?CloseNonGracefully@CCFChannelPairRawBase@CommsFW@@QAEXXZ @ 25 NONAME ; public: void __thiscall CommsFW::CCFChannelPairRawBase::CloseNonGracefully(void)
?ConstructL@CCFModuleChannelHandler@CommsFW@@IAEXAAUTMsgQueuesTAG@?$RCFChannelBase@VTCFMessage@CommsFW@@$00@2@0@Z @ 26 NONAME ; protected: void __thiscall CommsFW::CCFModuleChannelHandler::ConstructL(struct CommsFW::RCFChannelBase<class CommsFW::TCFMessage,1>::TMsgQueuesTAG &,struct CommsFW::RCFChannelBase<class CommsFW::TCFMessage,1>::TMsgQueuesTAG &)
?Create@RCFChannelRawBase@CommsFW@@QAEHHHPAVRMsgQueueBase@@H@Z @ 27 NONAME ; public: int __thiscall CommsFW::RCFChannelRawBase::Create(int,int,class RMsgQueueBase *,int)
- ?Create@RCFChannelRawBase@CommsFW@@QAEHPBVRMsgQueueBase@@W4TOwnerType@@PAV3@H@Z @ 28 NONAME ; public: int __thiscall CommsFW::RCFChannelRawBase::Create(class RMsgQueueBase const *,enum TOwnerType,class RMsgQueueBase *,int)
- ?Create@RCFThread@CommsFW@@QAEHABVTDesC16@@P6AHPAX@ZHHH1@Z @ 29 NONAME ABSENT ; public: int __thiscall CommsFW::RCFThread::Create(class TDesC16 const &,int (__cdecl*)(void *),int,int,int,void *)
+ ?Create@RCFChannelRawBase@CommsFW@@QAEHPBVRMsgQueueBase@@W4TOwnerType@@PAV3@H@Z @ 28 NONAME ; public: int __thiscall CommsFW::RCFChannelRawBase::Create(class RMsgQueueBase const *,enum TOwnerType,class RMsgQueueBase *,int)
+ ?PreallocateQueueSpaceL@CCommsTransport@CommsFW@@QAEXH@Z @ 29 NONAME ; void CommsFW::CCommsTransport::PreallocateQueueSpaceL(int)
?Create@RCFThread@CommsFW@@QAEHABVTDesC16@@P6AHPAX@ZHPAVRHeap@@1@Z @ 30 NONAME ABSENT ; public: int __thiscall CommsFW::RCFThread::Create(class TDesC16 const &,int (__cdecl*)(void *),int,class RHeap *,void *)
?CreateRecv@CCFChannelPairRawBase@CommsFW@@QAEHH@Z @ 31 NONAME ; public: int __thiscall CommsFW::CCFChannelPairRawBase::CreateRecv(int)
?CreateRecv@CCFChannelPairRawBase@CommsFW@@QAEHPBVRMsgQueueBase@@W4TOwnerType@@@Z @ 32 NONAME ; public: int __thiscall CommsFW::CCFChannelPairRawBase::CreateRecv(class RMsgQueueBase const *,enum TOwnerType)
@@ -97,6 +97,5 @@
?SetDropTransportPending@CCommsTransport@CommsFW@@QAEXGH@Z @ 96 NONAME ; void CommsFW::CCommsTransport::SetDropTransportPending(unsigned short, int)
?SetLastRequestIdConcerningPeer@CCommsTransport@CommsFW@@QAEXGH@Z @ 97 NONAME ; void CommsFW::CCommsTransport::SetLastRequestIdConcerningPeer(unsigned short, int)
?WorkerId@CCommsTransport@CommsFW@@QBEGXZ @ 98 NONAME ; unsigned short CommsFW::CCommsTransport::WorkerId(void) const
- ?GetVarFromIniData@CommsFW@@YAHABVTDesC8@@00AAH@Z @ 99 NONAME ; int CommsFW::GetVarFromIniData(class TDesC8 const &, class TDesC8 const &, class TDesC8 const &, int &)
+ ?GetVarFromIniData@CommsFW@@YAHABVTDesC8@@00AAH@Z @ 99 NONAME ; int CommsFW::GetVarFromIniData(class TDesC8 const &, class TDesC8 const &, class TDesC8 const &, int &)
-
--- a/commsfwsupport/commselements/commsfw/eabi/commsfwu.def Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/commsfw/eabi/commsfwu.def Mon Oct 04 02:21:43 2010 +0300
@@ -129,5 +129,5 @@
_ZN7CommsFW5PanicENS_18TCFTransportPanicsE @ 128 NONAME
_ZNK7CommsFW15CCommsTransport15RegisteredCountEv @ 129 NONAME
_ZN7CommsFW16CPerfMetricStore12RemoveClientEPv @ 130 NONAME
+ _ZN7CommsFW15CCommsTransport22PreallocateQueueSpaceLEi @ 131 NONAME
-
--- a/commsfwsupport/commselements/commsfw/inc/cftransport.h Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/commsfw/inc/cftransport.h Mon Oct 04 02:21:43 2010 +0300
@@ -288,6 +288,7 @@
IMPORT_C CommsFW::TId LastRequestIdConcerningPeer(TWorkerId aPeerId) const;
IMPORT_C void SetDropTransportPending(TWorkerId aPeerId, TBool aDropPending);
IMPORT_C TBool IsDropTransportPending(TWorkerId aPeerId) const;
+ IMPORT_C void PreallocateQueueSpaceL(TInt aMinUndeliveredMessages);
IMPORT_C TWorkerId WorkerId() const;
IMPORT_C Messages::MTransportSender& GetSender();
--- a/commsfwsupport/commselements/commsfw/src/cflog.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/commsfw/src/cflog.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -393,7 +393,7 @@
void CCFLog::ConstructL()
{
- iCsLock.CreateLocal();
+ User::LeaveIfError(iCsLock.CreateLocal());
// construct initial cflogger will be first in session arrays
RFileLogger* defaultflogger;
--- a/commsfwsupport/commselements/commsfw/src/cftransport.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/commsfw/src/cftransport.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -225,9 +225,9 @@
public:
enum
{
- KSelfSenderInitialQueueLength = 40, /** Initial size of self-sender queue (double what testing has observed) */
- KSelfSenderQueueGrowthStep = 40, /** Increment of self-sender queue size when full. PostMessage() functions panic if growth
- required and fails; to minimise this risk ensure initial size adequate for all likely cases */
+ KSelfSenderInitialQueueLength = 20, /** Initial size of self-sender queue */
+ KSelfSenderQueuePreAllocationGrowthStep = 20, /** Additionl space to reserve each time we pre-allocate some queue space to avoind too much re-allocation */
+ KSelfSenderQueueGrowthStep = 20 /** Increment of self-sender queue size when full. PostMessage() functions panic if growth required and fails */
};
static CTransportSelfSender* NewL(MMessageDispatcher& aDispatcher, TWorkerId aSelfId);
@@ -264,6 +264,8 @@
{
return EFalse;
}
+
+ void PreallocateQueueSpaceL(TInt aMinUndeliveredMessages);
~CTransportSelfSender();
protected:
@@ -277,7 +279,7 @@
TInt DoPostMessage(const TRuntimeCtxId& aPostFrom, const TRuntimeCtxId& aPostTo, const TDesC8& aMessage);
TInt ProcessMessage(TCFMessage2& aMessage, TInt aFirstDispatchLeaveReason);
void MaybeTriggerReceipt();
- TInt ResizeQueue(TInt aAdditionalChips);
+ void ResizeQueueL(TInt aAdditionalChips);
private:
TChipReceiver iReceiver;
CCirBuf<TCFMessage>* iBuf;
@@ -311,29 +313,43 @@
CleanupStack::Pop(self);
return self;
}
+/*
+ * Preemptively allocate self sender queue length, given by aMinUndeliveredMessages.
+ * Note the current logic for queue enlargement is rather coarse, preferring linear growth by a fixed amount.
+ * A better approach would have been to implement a logarithmic increase for the queue length, which would have saved a bit more memory when the
+ */
+void CTransportSelfSender::PreallocateQueueSpaceL(TInt aMinUndeliveredMessages)
+ {
+ TInt currentLength = iBuf->Length();
+ if (aMinUndeliveredMessages > currentLength)
+ {
+ TInt resizeBy = aMinUndeliveredMessages - currentLength;
+ __CFLOG_VAR(( KLogCommsFw, KLogFwTransport, _L8("CTransportSelfSender::PreallocateQueueSpaceL(%d) Trying to enlarge queue from %d to %d chips"), aMinUndeliveredMessages, currentLength, currentLength + resizeBy + KSelfSenderQueuePreAllocationGrowthStep ));
+ ResizeQueueL(resizeBy + KSelfSenderQueuePreAllocationGrowthStep);
+ __CFLOG_VAR(( KLogCommsFw, KLogFwTransport, _L8("CTransportSelfSender::PreallocateQueueSpaceL queue enlargement successful") ));
+ }
+ }
-TInt CTransportSelfSender::ResizeQueue(TInt aAdditionalChips)
+void CTransportSelfSender::ResizeQueueL(TInt aAdditionalChips)
{
+ __CFLOG_VAR(( KLogCommsFw, KLogFwTransport, _L8("CTransportSelfSender::ResizeQueueL(%d)"), aAdditionalChips ));
+
TInt newLen = iBuf->Length() + aAdditionalChips;
__ASSERT_ALWAYS(newLen > iBuf->Count(), Panic(ECFInvalidQueueSize));
+
+ if (iBuf->Count() == 0)
+ {
+ iBuf->SetLengthL(newLen);
+ return;
+ }
// Create a new queue of the requisite size, copy the elements, and swap for the original
// (there's no safe way to resize in-place).
- CCirBuf<TCFMessage>* newBuf = new CCirBuf<TCFMessage>;
- if(newBuf == NULL)
- {
- __CFLOG_VAR(( KLogCommsFw, KLogFwTransport, _L8("ERROR: CTransportSelfSender::ResizeQueue() unable to enlarge queue from %d chips to %d chips because error -4 occured"), iBuf->Length(), newLen ));
-
- return KErrNoMemory;
- }
-
- TRAPD(ret, newBuf->SetLengthL(newLen));
- if(ret != KErrNone)
- {
- __CFLOG_VAR(( KLogCommsFw, KLogFwTransport, _L8("ERROR: CTransportSelfSender::ResizeQueue() unable to enlarge queue from %d chips to %d chips because error %d occured"), iBuf->Length(), newLen, ret ));
-
- return ret;
- }
+ CCirBuf<TCFMessage>* newBuf = new (ELeave) CCirBuf<TCFMessage>;
+ CleanupStack::PushL(newBuf);
+ newBuf->SetLengthL(newLen);
+ CleanupStack::Pop(newBuf);
+
TCFMessage entry;
while(iBuf->Remove(&entry))
{
@@ -341,7 +357,6 @@
}
delete iBuf;
iBuf = newBuf;
- return KErrNone;
}
void CTransportSelfSender::PostMessage(const TCFMessage& aMessage)
@@ -349,21 +364,10 @@
TInt ret = DoPostMessage(aMessage);
if(ret != KErrNone)
{
- ResizeQueue(KSelfSenderQueueGrowthStep);
+ TRAP_IGNORE(ResizeQueueL(KSelfSenderQueueGrowthStep));
ret = DoPostMessage(aMessage);
- //For the benefit of OOM testing as we currently do it (only the sequential failure model)
- //we attempt to resize the queue for the second time.
- //In real scenarios this approach has very limited or no value as the OOM conditions do rarely
- //resemble the ones of our sequential failure OOM testing.
- //Therefore it would probably make sense to configure out the code for UREL and only keep
- //it for _DEBUG.
- if(ret != KErrNone)
- {
- ResizeQueue(KSelfSenderQueueGrowthStep);
- ret = DoPostMessage(aMessage);
- __ASSERT_ALWAYS(ret == KErrNone, Panic(ECFTransPeerDrainFailure)); // true, even though peer is us...
- }
}
+ __ASSERT_ALWAYS(ret == KErrNone, Panic(ECFTransPeerDrainFailure)); // true, even though peer is us...
}
void CTransportSelfSender::PostMessage(const TRuntimeCtxId& aPostFrom, const TRuntimeCtxId& aPostTo, const TDesC8& aMessage)
@@ -372,21 +376,10 @@
TInt ret = DoPostMessage(aPostFrom, aPostTo, aMessage);
if(ret != KErrNone)
{
- ResizeQueue(KSelfSenderQueueGrowthStep);
+ TRAP_IGNORE(ResizeQueueL(KSelfSenderQueueGrowthStep));
ret = DoPostMessage(aPostFrom, aPostTo, aMessage);
- //For the benefit of OOM testing as we currently do it (only the sequential failure model)
- //we attempt to resize the queue for the second time.
- //In real scenarios this approach has very limited or no value as the OOM conditions do rarely
- //resemble the ones of our sequential failure OOM testing.
- //Therefore it would probably make sense to configure out the code for UREL and only keep
- //it for _DEBUG.
- if(ret != KErrNone)
- {
- ResizeQueue(KSelfSenderQueueGrowthStep);
- ret = DoPostMessage(aPostFrom, aPostTo, aMessage);
- __ASSERT_ALWAYS(ret == KErrNone, Panic(ECFTransPeerDrainFailure)); // true, even though peer is us...
- }
}
+ __ASSERT_ALWAYS(ret == KErrNone, Panic(ECFTransPeerDrainFailure)); // true, even though peer is us...
}
@@ -453,7 +446,7 @@
}
else
{
- ResizeQueue(KSelfSenderQueueGrowthStep);
+ TRAP_IGNORE(ResizeQueueL(KSelfSenderQueueGrowthStep));
err = DoPostMessage(*msgPtr);
if(err != KErrNone)
{
@@ -961,6 +954,8 @@
{
return GetSenderMandatory(aPeerId)->IsDropTransportPending();
}
+
+ void PreallocateQueueSpaceL(TInt aMinUndeliveredMessages);
void RunL(); // for deleting chippers posted to death row
private:
@@ -1410,6 +1405,15 @@
}
}
+void CCommsTransportImpl::PreallocateQueueSpaceL(TInt aMinUndeliveredMessages)
+ {
+#ifndef SYMBIAN_NETWORKING_INTERTHREAD_TRANSPORT_ONLY
+ iSelfSender->PreallocateQueueSpaceL(aMinUndeliveredMessages);
+#else
+ (void)aSize; // Do nothing
+#endif
+ }
+
//
EXPORT_C CCommsTransport* CCommsTransport::NewL(MWorkerThreadRegister& aThreadRegister, const CMetaDataVirtualCtorInPlace* aVirtCtor, CCFTransportHooks* /*aHooksWalker*/)
@@ -1538,6 +1542,10 @@
return iImpl->IsDropTransportPending(aPeerId);
}
+EXPORT_C void CCommsTransport::PreallocateQueueSpaceL(TInt aMinUndeliveredMessages)
+ {
+ iImpl->PreallocateQueueSpaceL(aMinUndeliveredMessages);
+ }
//
--- a/commsfwsupport/commselements/factories/bwins/factoriesu.def Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/factories/bwins/factoriesu.def Mon Oct 04 02:21:43 2010 +0300
@@ -28,4 +28,5 @@
?SignalCreation@CFactoryBase@Factories@@AAEHAAVAFactoryObject@2@@Z @ 27 NONAME ; int Factories::CFactoryBase::SignalCreation(class Factories::AFactoryObject &)
?SignalDeletion@CFactoryBase@Factories@@AAEXAAVAFactoryObject@2@@Z @ 28 NONAME ; void Factories::CFactoryBase::SignalDeletion(class Factories::AFactoryObject &)
?Uid@CFactoryBase@Factories@@QBE?AVTUid@@XZ @ 29 NONAME ; class TUid Factories::CFactoryBase::Uid(void) const
+ ?InterfaceStateChange@CFactoryBase@Factories@@QAEXABVTDesC8@@@Z @ 30 NONAME ; void Factories::CFactoryBase::InterfaceStateChange(class TDesC8 const &)
--- a/commsfwsupport/commselements/factories/eabi/factoriesu.def Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/factories/eabi/factoriesu.def Mon Oct 04 02:21:43 2010 +0300
@@ -47,4 +47,5 @@
_ZTVN9Factories14AFactoryObjectE @ 46 NONAME
_ZTVN9Factories17CFactoryContainerE @ 47 NONAME
_ZTVN9Factories21CFactoryContainerNodeE @ 48 NONAME
+ _ZN9Factories12CFactoryBase20InterfaceStateChangeERK6TDesC8 @ 49 NONAME
--- a/commsfwsupport/commselements/factories/inc/factory.h Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/factories/inc/factory.h Mon Oct 04 02:21:43 2010 +0300
@@ -100,6 +100,9 @@
IMPORT_C void RegisterNotifierL(const IFactoryNotify& aFactoryNotify);
IMPORT_C void DeRegisterNotifier(const IFactoryNotify& aFactoryNotify);
+ // Called by a node to indicate that an interface state change has taken place. The factory then propagates
+ // this to all observers that have registered to be notified.
+ IMPORT_C void InterfaceStateChange(const TDesC8& aInfo);
protected:
IMPORT_C explicit CFactoryBase(TUid aFactoryUid, CFactoryContainer& aParentContainer);
--- a/commsfwsupport/commselements/factories/inc/factorynotify.h Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/factories/inc/factorynotify.h Mon Oct 04 02:21:43 2010 +0300
@@ -28,7 +28,7 @@
namespace Factories
{
-typedef void (*TInterfaceStateChangeFn)( TAny*, TDesC8& aInfo );
+typedef void (*TInterfaceStateChangeFn)( TAny*, const TDesC8& aInfo );
typedef TInt (*TFactoryNotifyFn)( TAny*, AFactoryObject& aObject, CFactoryBase& aFactory );
typedef void (*TAnyFn)(TAny*);
@@ -50,7 +50,7 @@
{
}
- void InterfaceStateChange(TDesC8& aInfo)
+ void InterfaceStateChange(const TDesC8& aInfo)
{
if ( Check(1) )
{
@@ -89,14 +89,14 @@
*/
{
public:
- static void Notification(TAny* aThis, TDesC8& aInfo);
+ static void Notification(TAny* aThis, const TDesC8& aInfo);
static void NotifyDeletion(TAny* aThis, AFactoryObject& aObject, CFactoryBase& aFactory);
static TInt NotifyCreation(TAny* aThis, AFactoryObject& aObject, CFactoryBase& aFactory);
};
template <class TCLIENT>
-void TFactoryNotify<TCLIENT>::Notification(TAny* aThis, TDesC8& aInfo)
+void TFactoryNotify<TCLIENT>::Notification(TAny* aThis, const TDesC8& aInfo)
{
TCLIENT* me = (TCLIENT*)aThis;
me->InterfaceStateChangeNotification(aInfo);
--- a/commsfwsupport/commselements/factories/src/factory.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/factories/src/factory.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -432,6 +432,14 @@
return obj;
}
+EXPORT_C void CFactoryBase::InterfaceStateChange(const TDesC8& aInfo)
+ {
+ for (TInt i = iFactoryNotify.Count() - 1; i >= 0; --i)
+ {
+ iFactoryNotify[i].InterfaceStateChange(aInfo);
+ }
+ }
+
EXPORT_C AFactoryObject::AFactoryObject(CFactoryBase& aFactory)
: iFactory(aFactory)
{
--- a/commsfwsupport/commselements/meshmachine/bwins/meshmachineu.def Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/meshmachine/bwins/meshmachineu.def Mon Oct 04 02:21:43 2010 +0300
@@ -138,4 +138,5 @@
?SetPostedTo@CNodeActivityBase@MeshMachine@@QAEXABVRNodeInterface@Messages@@@Z @ 137 NONAME ; void MeshMachine::CNodeActivityBase::SetPostedTo(class Messages::RNodeInterface const &)
?PostedToNodeId@CNodeActivityBase@MeshMachine@@QBEABVTNodeId@Messages@@XZ @ 138 NONAME ; class Messages::TNodeId const & MeshMachine::CNodeActivityBase::PostedToNodeId(void) const
?PostedToPeer@CNodeActivityBase@MeshMachine@@QBEPBVRNodeInterface@Messages@@XZ @ 139 NONAME ; class Messages::RNodeInterface const * MeshMachine::CNodeActivityBase::PostedToPeer(void) const
+ ?GetNextActivityCountL@CNodeParallelActivityBase@MeshMachine@@KAIABUTNodeActivity@2@ABVAMMNodeBase@2@@Z @ 140 NONAME ; unsigned int MeshMachine::CNodeParallelActivityBase::GetNextActivityCountL(struct MeshMachine::TNodeActivity const &, class MeshMachine::AMMNodeBase const &)
Binary file commsfwsupport/commselements/meshmachine/doc_pub/MeshMachineFundamentals.doc has changed
--- a/commsfwsupport/commselements/meshmachine/eabi/meshmachineu.def Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/meshmachine/eabi/meshmachineu.def Mon Oct 04 02:21:43 2010 +0300
@@ -206,4 +206,5 @@
_ZN11MeshMachine17CNodeActivityBase11SetPostedToERKN8Messages14RNodeInterfaceE @ 205 NONAME
_ZNK11MeshMachine17CNodeActivityBase12PostedToPeerEv @ 206 NONAME
_ZNK11MeshMachine17CNodeActivityBase14PostedToNodeIdEv @ 207 NONAME
+ _ZN11MeshMachine25CNodeParallelActivityBase21GetNextActivityCountLERKNS_13TNodeActivityERKNS_11AMMNodeBaseE @ 208 NONAME
--- a/commsfwsupport/commselements/meshmachine/inc/mm_activities.h Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/meshmachine/inc/mm_activities.h Mon Oct 04 02:21:43 2010 +0300
@@ -39,6 +39,20 @@
//-=========================================================
//
+//Panics
+//
+//-=========================================================
+_LIT (KMMActivityPanic,"MMActivityPanic");
+enum
+ {
+ EPanicCorruptedContext = 1,
+ EPanicNoPreallocatedSpace = 2,
+ EPanicOutOfActivities = 3,
+ EPanicOutOfBounds
+ };
+
+//-=========================================================
+//
// MACROS
//
//-=========================================================
@@ -1048,7 +1062,7 @@
@param aNode The node to which this activity will belong.
@return Generated unique component of activity id
*/
- static TUint GetNextActivityCountL( const TNodeActivity& aActivitySig, const AMMNodeBase& aNode );
+ IMPORT_C static TUint GetNextActivityCountL( const TNodeActivity& aActivitySig, const AMMNodeBase& aNode );
/**
For use by custom activity News to generate the unique part of the activity id.
@param aActivitySig Context information about how the activity is to be started
@@ -1065,6 +1079,15 @@
*/
IMPORT_C CNodeParallelActivityBase( const TNodeActivity& aActivitySig, AMMNodeBase& aNode, TUint aNextActivityCount );
+private:
+ /**
+ For use by custom activity NewLs to generate the unique part of the activity id.
+ @param aActivitySig Context information about how the activity is to be started
+ @param aNode The node to which this activity will belong.
+ @return Generated unique component of activity id
+ */
+ static TUint DoGetNextActivityCountL( const TNodeActivity& aActivitySig, const AMMNodeBase& aNode );
+
protected:
/**
The activity id. The id format is [8 bit unique id|8 bit activity sig].
@@ -1597,13 +1620,6 @@
static MeshMachine::CNodeActivityBase* NewL(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
};
-
-inline TUint CNodeParallelActivityBase::GetNextActivityCountL( const TNodeActivity& aActivitySig, const AMMNodeBase& aNode )
- {
- //Historical. Method ceased to leave, but must keep the old, L-ending overload.
- return GetNextActivityCount(aActivitySig, aNode);
- }
-
//By default we reserve the space for preallocated activities generously, to fit even a synchronised activity preallocating space for up to 3 originators.
//Any node, hosting specific activities that may need the preallocation mechanism can choose a more optimal amounts.
//For efficiency reasons it is strongly recommended that any node (or family of nodes) is revisited and an optimal
--- a/commsfwsupport/commselements/meshmachine/inc/mm_nodepeer.h Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/meshmachine/inc/mm_nodepeer.h Mon Oct 04 02:21:43 2010 +0300
@@ -65,20 +65,35 @@
return Peer().Type();
}
- TUint32 Flags() const
- {
- return Peer().Flags();
- }
+ TUint32 Flags() const
+ {
+ // Non-client peers lack flags (a state early in relationship)
+ if(PeerPtr())
+ {
+ return PeerPtr()->Flags();
+ }
+ return 0;
+ }
- TUint32 SetFlags(TUint32 aFlags)
- {
- return Peer().SetFlags(aFlags);
- }
+ TUint32 SetFlags(TUint32 aFlags)
+ {
+ // We only require peer info to be present if an actual state change is occurring (as opposed to default handling)
+ if(aFlags)
+ {
+ return Peer().SetFlags(aFlags);
+ }
+ return Flags();
+ }
- TUint32 ClearFlags(TUint32 aFlags)
- {
- return Peer().ClearFlags(aFlags);
- }
+ TUint32 ClearFlags(TUint32 aFlags)
+ {
+ // We only require peer info to be present if an actual state change is occurring (as opposed to default handling)
+ if(aFlags)
+ {
+ return Peer().ClearFlags(aFlags);
+ }
+ return Flags();
+ }
const RNodeInterface& Peer() const
{
--- a/commsfwsupport/commselements/meshmachine/src/mm_activities.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/meshmachine/src/mm_activities.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -38,20 +38,6 @@
//-=========================================================
//
-//Panics
-//
-//-=========================================================
-_LIT (KMMActivityPanic,"MMActivityPanic");
-enum
- {
- EPanicCorruptedContext = 1,
- EPanicNoPreallocatedSpace = 2,
- EPanicOutOfActivities = 3,
- EPanicOutOfBounds
- };
-
-//-=========================================================
-//
//TNodeActivityIter
//
//-=========================================================
@@ -556,7 +542,7 @@
static const TUint32 iFull = ~0;
static const TInt iCount = (SIZE + iSizeMask) / iSize;
TBitmap();
- void SetBit(TUint aBitNum);
+ void SetBitL(TUint aBitNum);
TInt GetFreeBit() const;
private:
@@ -573,10 +559,10 @@
}
template<TInt SIZE>
-void TBitmap<SIZE>::SetBit(TUint aBitNum)
+void TBitmap<SIZE>::SetBitL(TUint aBitNum)
{
const TInt index = aBitNum / iSize;
- __ASSERT_ALWAYS(index < iCount,User::Panic(KMMActivityPanic,EPanicOutOfBounds));
+ User::LeaveIfError(index < iCount ? KErrNone : KErrOverflow);
iBits[index] |= 1 << (aBitNum & iSizeMask);
}
@@ -612,9 +598,22 @@
//
//-=========================================================
+EXPORT_C TUint CNodeParallelActivityBase::GetNextActivityCountL( const TNodeActivity& aActivitySig, const AMMNodeBase& aNode )
+ {
+ return DoGetNextActivityCountL(aActivitySig, aNode);
+ }
+
+EXPORT_C TUint CNodeParallelActivityBase::GetNextActivityCount( const TNodeActivity& aActivitySig, const AMMNodeBase& aNode )
+ {
+ // Version for infallible activities
+ TUint nextActivity(0);
+ TRAPD(err,nextActivity = DoGetNextActivityCountL(aActivitySig, aNode));
+ __ASSERT_ALWAYS(err == KErrNone,User::Panic(KMMActivityPanic,EPanicOutOfActivities));
+ return nextActivity;
+ }
// For custom activities to implement New
-EXPORT_C TUint CNodeParallelActivityBase::GetNextActivityCount( const TNodeActivity& aActivitySig, const AMMNodeBase& aNode )
+TUint CNodeParallelActivityBase::DoGetNextActivityCountL( const TNodeActivity& aActivitySig, const AMMNodeBase& aNode )
{
TInt c = 1;
@@ -628,12 +627,12 @@
if ((id&0xff) == aActivitySig.iId)
{
TInt8 uniqueid = id >> 8;
- activityids.SetBit(uniqueid);
+ activityids.SetBitL(uniqueid);
}
}
c = activityids.GetFreeBit();
- __ASSERT_ALWAYS(c>=0,User::Panic(KMMActivityPanic,EPanicOutOfActivities));
+ User::LeaveIfError( c>=0 ? KErrNone : KErrOverflow);
return c;
}
--- a/commsfwsupport/commselements/meshmachine/src/mm_node.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/meshmachine/src/mm_node.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -735,7 +735,10 @@
if(!freeCellFound)
{
MESH_LOG((KMeshMachineSubTag, _L8("ERROR AMMNodeBase %08x:\tBorrowPreallocatedSpace - All %d preallocation cells have been allocated!"), this, maxPreallocatedActivities));
- __ASSERT_ALWAYS(freeCellFound, User::Panic(KMMNodePanic, EPanicPreallocatedSpaceAlreadyTaken));
+ __ASSERT_DEBUG(freeCellFound, User::Panic(KMMNodePanic, EPanicPreallocatedSpaceAlreadyTaken));
+ // Attempt to allocate some space from the heap now in a last attempt to continue processing.
+ TRAPD(err,ptr = User::AllocL(aSize));
+ __ASSERT_ALWAYS(err, User::Panic(KMessagesPanic, EPreAllocationFailedPanic));
}
return ptr;
@@ -766,6 +769,8 @@
{
MESH_LOG((KMeshMachineSubTag, _L8("ERROR AMMNodeBase %08x:\tReturnPreallocatedSpace - the returned pointer 0x%08X is invalid!"), this, aSpace));
__ASSERT_DEBUG(allocatedCellFound, User::Panic(KMMNodePanic, EPanicPreallocatedSpaceReturnedOther));
+ // May be returning a cell which was created in error recovery section of the Borrow in which case if must be "free"d.
+ User::Free(aSpace);
}
}
Binary file commsfwsupport/commselements/nodemessages/doc_pub/NodeMessages_Design.doc has changed
Binary file commsfwsupport/commselements/nodemessages/documentation/NodeMessages_Design.vsd has changed
--- a/commsfwsupport/commselements/nodemessages/inc/nm_common.h Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/nodemessages/inc/nm_common.h Mon Oct 04 02:21:43 2010 +0300
@@ -49,7 +49,9 @@
EMessageCastPanic,
EConstructedObjectTooBig,
EAddressNotValidPanic,
- EClientNotValidPanic
+ EClientNotValidPanic,
+ EDeceasedNodePanic,
+ EPreAllocationFailedPanic
};
--- a/commsfwsupport/commselements/nodemessages/inc/nm_interfaces.h Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/nodemessages/inc/nm_interfaces.h Mon Oct 04 02:21:43 2010 +0300
@@ -416,6 +416,13 @@
iPreAllocSize=0;
iPreAllocatedActivityChunk=NULL;
}
+ ~TPreAllocStore()
+ {
+ if(iPreAllocatedActivityChunk != NULL)
+ {
+ User::Free(iPreAllocatedActivityChunk);
+ }
+ }
TUint iPreAllocSize;
TAny* iPreAllocatedActivityChunk;
};
--- a/commsfwsupport/commselements/nodemessages/src/nm_interfaces.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/nodemessages/src/nm_interfaces.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -23,7 +23,6 @@
#include <elements/nm_address_internal.h>
#include "nm_signals.h"
-
#ifdef _DEBUG
// Panic category for "absolutely impossible!" vanilla ASSERT()-type panics from this module
// (if it could happen through user error then you should give it an explicit, documented, category + code)
@@ -140,10 +139,9 @@
iClientType = TClientType::NullType();
if(iPreAlloc!=NULL)
{
- delete iPreAlloc->iPreAllocatedActivityChunk;
+ delete iPreAlloc;
+ iPreAlloc = NULL;
}
- delete iPreAlloc;
- iPreAlloc = NULL;
}
EXPORT_C void RNodeInterface::PostMessage(const TRuntimeCtxId& aPostFrom, const TNodeId::TRemainder& aPostTo, const TSignalBase& aMessage) const
@@ -171,11 +169,28 @@
if(iPreAlloc!=NULL)
// Memory already allocated for this client
{
- __ASSERT_DEBUG(iPreAlloc->iPreAllocatedActivityChunk != NULL, User::Panic(KSpecAssert_ElemNodeMessIntC, 5));
- return;
+ // If iPreAlloc is not NULL then it should be usable. Ensure that the memory chunk has been suitable allocated
+ __ASSERT_DEBUG(iPreAlloc->iPreAllocatedActivityChunk != NULL, User::Panic(KSpecAssert_ElemNodeMessIntC, 2));
+ if(iPreAlloc->iPreAllocSize >= aAllocSize)
+ // Memory already preallocated of a sufficient size - this could happen if clients are re-added
+ {
+ return;
+ }
+ else
+ // Memory preallocated is too small. Free up the space and then attempt to reallocate
+ {
+ // Code path should never enter here as PreAllocL should not be called once the iPreAlloc memory space is allocated.
+ // However on the chance of production device entering here attempt to clear the preallocated space and reallocate a more suitable amount.
+ __ASSERT_DEBUG(EFalse, User::Panic(KSpecAssert_ElemNodeMessIntC, 3));
+ delete iPreAlloc;
+ iPreAlloc = NULL;
+ }
}
- iPreAlloc = new (ELeave) TPreAllocStore();
- iPreAlloc->iPreAllocatedActivityChunk = User::AllocL(aAllocSize);
+ TPreAllocStore* preAlloc = new (ELeave) TPreAllocStore();
+ CleanupStack::PushL(preAlloc);
+ preAlloc->iPreAllocatedActivityChunk = User::AllocL(aAllocSize);
+ CleanupStack::Pop(preAlloc);
+ iPreAlloc = preAlloc;
iPreAlloc->iPreAllocSize = aAllocSize;
}
@@ -188,12 +203,15 @@
if(!(iPreAlloc && aSize <= iPreAlloc->iPreAllocSize))
{
// By this stage the PreAllocL must have been triggered and memory space must have been allocated.
- __ASSERT_DEBUG(EFalse, User::Panic(KSpecAssert_ElemNodeMessIntC, 3));
- delete iPreAlloc->iPreAllocatedActivityChunk;
- iPreAlloc->iPreAllocatedActivityChunk = User::AllocL(aSize);
+ __ASSERT_DEBUG(EFalse, User::Panic(KSpecAssert_ElemNodeMessIntC, 4));
+ TRAPD(err,PreAllocL(aSize));
+ __ASSERT_ALWAYS(err, User::Panic(KMessagesPanic, EPreAllocationFailedPanic));
}
TAny* preallocatedSpace = (RNodeInterface*)iPreAlloc->iPreAllocatedActivityChunk;
- iPreAlloc->iPreAllocatedActivityChunk=NULL;
+ // Release ownership of the memory area
+ iPreAlloc->iPreAllocatedActivityChunk = NULL;
+ delete iPreAlloc;
+ iPreAlloc = NULL;
return preallocatedSpace;
}
@@ -252,7 +270,7 @@
EXPORT_C void RRequestOriginator::Open(RRequestOriginator& aOriginalRequest)
{
- __ASSERT_DEBUG(aOriginalRequest.IsOpen(), User::Panic(KSpecAssert_ElemNodeMessIntC, 4));
+ __ASSERT_DEBUG(aOriginalRequest.IsOpen(), User::Panic(KSpecAssert_ElemNodeMessIntC, 1));
iNode = aOriginalRequest.iNode;
iRemainder = aOriginalRequest.iRemainder;
aOriginalRequest.Close();
--- a/commsfwsupport/commselements/nodemessages/src/nm_messages.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/nodemessages/src/nm_messages.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -52,6 +52,7 @@
{
const TNodeId& nodeId = address_cast<TNodeId>(aRecipient); //This message type operates on nodes
__ASSERT_DEBUG(nodeId.Ptr(), User::Panic(KSpecAssert_ElemNodeMessMesC, 1));
+ __ASSERT_ALWAYS(nodeId.Node().NodeId() == nodeId, User::Panic(KMessagesPanic, EDeceasedNodePanic)); //Address reuse protection (Ptr() may match something existing, but not necesserily the intended addresee).
nodeId.Node().ReceivedL(aSender, nodeId, *this);
}
--- a/commsfwsupport/commselements/serverden/src/sd_workersession.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwsupport/commselements/serverden/src/sd_workersession.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -62,6 +62,7 @@
EXPORT_C CSubSessionIx::~CSubSessionIx()
{
+ iLock.Close();
User::Free(iIx);
}
@@ -693,6 +694,14 @@
EXPORT_C void CWorkerSubSession::ConstructL()
{
iSessionProxy = Player().CurrentSessionProxyL();
+ // Try reserving enough space in the transport sender queue so that we don't overflow the queue
+ // when sending messages in bulk, which can happen in cases like closing the session without
+ // closing individual sub-sessions. Protyping reveals that with a high number of number of
+ // sub-sessions, a transport queue length twice the number of active sub-session is a safe bet
+ CCommsTransport* transport = iPlayer->WorkerThread().Transport();
+ TInt numSubsession = iSession->SubSessions().ActiveCount() + 1;
+ const TInt numUndeliveredMessae = numSubsession * 2;
+ transport->PreallocateQueueSpaceL(numUndeliveredMessae);
}
EXPORT_C CWorkerSubSession::~CWorkerSubSession()
--- a/commsfwtools/commstools/svg/parselog.pl Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwtools/commstools/svg/parselog.pl Mon Oct 04 02:21:43 2010 +0300
@@ -44,7 +44,7 @@
require 'getopts.pl';
-my $version = "2.2 (16/04/10)";
+my $version = "2.3 (16/06/10)";
#
# Internal Options
@@ -160,7 +160,7 @@
#OLD:
#CFNode MetaConn a 47 W6: CIpTierManagerFactory 0c1822d0: created [MCFNode 0c1822d8] [96]
#NEW:
-#250,194,1,1864213751,0,0x00f3e114,ENodeMessages: CFactoryContainerNode 0e571204: created [MNode 0e571220] [44]
+#250,194,1,1864213751,0,0x00f3e114,ENodeMessages: CFactoryContainerNode 0e571204: created [ANode 0e571220] [44]
elsif (/.*created \[ANode=0x([0-9A-Fa-f]{8})\]/) {
my ($name,$realaddr,$nodeaddr) = m/(\w+) ([0-9A-Fa-f]{8}):\tcreated \[ANode=0x([0-9A-Fa-f]{8})\]/;
$realaddr =~ s/^0x//;
@@ -223,7 +223,7 @@
print "l ^Shutting-down\n";
$lifeStage = 0;
}
-#1061,194,2,1212990838,0,0x00a1b488,ENodeMessages: [STARTBLOCK=Context] CNodeActivityBase 0d922584: StartL->starting activity Node: [MNode=0x0d9229e0] Sender: [Address=[iThread=0x0006] [iPtr=0x0d922338] ] Recipient: [Address=[iThread=0x0006] [iPtr=0x0d9229e0] ] aContext.iMessage: [Signature=0x00000000:0xfdfdfdfd] [STARTBLOCK=Activity] [Activity=MCprControlClientJoin] [CurrentTriple=Idle] [ENDBLOCK=Activity] [ENDBLOCK=Context]
+#1061,194,2,1212990838,0,0x00a1b488,ENodeMessages: [STARTBLOCK=Context] CNodeActivityBase 0d922584: StartL->starting activity Node: [ANode=0x0d9229e0] Sender: [Address=[iThread=0x0006] [iPtr=0x0d922338] ] Recipient: [Address=[iThread=0x0006] [iPtr=0x0d9229e0] ] aContext.iMessage: [Signature=0x00000000:0xfdfdfdfd] [STARTBLOCK=Activity] [Activity=MCprControlClientJoin] [CurrentTriple=Idle] [ENDBLOCK=Activity] [ENDBLOCK=Context]
elsif (/starting activity.*?\[ANode=0x([0-9A-Fa-f]{8})\].*\[Activity=(\w*)\]/)
{
if (!($opt_X & 1))
@@ -360,9 +360,9 @@
{
print "t ", objectName($lastDispatchDestination), " (STRAY $1)\n";
}
-#1077,194,2,1212991263,0,0x00a1b488,ENodeMessages: [STARTBLOCK=Context] CNodeActivityBase 0d922584: StartL->activity started Node: [MNode=0x0d9229e0] Sender: [Address=[iThread=0x0006] [iPtr=0x0d922338] ] Recipient: [Address=[iThread=0x0006] [iPtr=0x0d9229e0] ] aContext.iMessage: [Signature=0x00000000:0xfdfdfdfd] [STARTBLOCK=Activity] [Activity=MCprControlClientJoin] [CurrentTriple=MCprStates::TDecrementBlockingDestoryAndAddControlClientAndSendJoinCompleteIfRequest->NULL] [ENDBLOCK=Activity] [ENDBLOCK=Context]
-#843,195,1,1212618492,0,0x00a1b488,EMeshMachine: CNodeActivityBase: Accept->First transition: ConnStates::TProcessStateChange->MeshMachine::TAwaitingStateChange [MNode=0x0b1ff948]
-#897,194,2,1212884309,0,0x00a1b488,ENodeMessages: [STARTBLOCK=Activity] CNodeActivityBase 0d921eb8: Next->transition happened [MNode=0x0b1ff948] [Activity=ConnectionStart] [CurrentTriple=ConnStates::TSelectMetaPlane->TECABState<CoreNetStates::TAwaitingBindTo>] [ENDBLOCK=Activity]
+#1077,194,2,1212991263,0,0x00a1b488,ENodeMessages: [STARTBLOCK=Context] CNodeActivityBase 0d922584: StartL->activity started Node: [ANode=0x0d9229e0] Sender: [Address=[iThread=0x0006] [iPtr=0x0d922338] ] Recipient: [Address=[iThread=0x0006] [iPtr=0x0d9229e0] ] aContext.iMessage: [Signature=0x00000000:0xfdfdfdfd] [STARTBLOCK=Activity] [Activity=MCprControlClientJoin] [CurrentTriple=MCprStates::TDecrementBlockingDestoryAndAddControlClientAndSendJoinCompleteIfRequest->NULL] [ENDBLOCK=Activity] [ENDBLOCK=Context]
+#843,195,1,1212618492,0,0x00a1b488,EMeshMachine: CNodeActivityBase: Accept->First transition: ConnStates::TProcessStateChange->MeshMachine::TAwaitingStateChange [ANode=0x0b1ff948]
+#897,194,2,1212884309,0,0x00a1b488,ENodeMessages: [STARTBLOCK=Activity] CNodeActivityBase 0d921eb8: Next->transition happened [ANode=0x0b1ff948] [Activity=ConnectionStart] [CurrentTriple=ConnStates::TSelectMetaPlane->TECABState<CoreNetStates::TAwaitingBindTo>] [ENDBLOCK=Activity]
#1237,195,1,2340065279,0,0x00dfff38,EMeshMachine: CNodeActivityBase 0cb427ec: Next->match [ANode=0x0cb42c48] [Activity=MCprBinderRequest] [Triple=PRStates::TCreateDataClient->CoreNetStates::TAwaitingDataClientJoin]
elsif (($opt_X & 2) == 0 && (/(StartL)->activity started.*?\[ANode=0x([0-9a-f]{8})\].*\[Activity=(\S*)\].*\[Triple=(\S*)\]/ ||
@@ -440,11 +440,11 @@
print "t ", objectName($activityNode{$actAddr}), " ($activityName{$actAddr}) Cancel(). Posted to ", objectName($postedToId), "\n";
}
}
- elsif (($opt_X & 4) == 0 && /UnparkState->unparked\s+\[MNode=0x([0-9a-fA-F]{8})\].*\[Activity=(\w+)\].*\[Triple=(.*?)\]/)
+ elsif (($opt_X & 4) == 0 && /UnparkState->unparked\s+\[ANode=0x([0-9a-fA-F]{8})\].*\[Activity=(\w+)\].*\[Triple=(.*?)\]/)
{
print "t ", objectName($1), " {50,200,50} (Unparked $2, $3)\n";
}
- elsif (($opt_X & 4) == 0 && /ParkState->parked\s+\[MNode=0x([0-9a-fA-F]{8})\].*\[Activity=(\w+)\].*\[Triple=(.*?)\]/) {
+ elsif (($opt_X & 4) == 0 && /ParkState->parked\s+\[ANode=0x([0-9a-fA-F]{8})\].*\[Activity=(\w+)\].*\[Triple=(.*?)\]/) {
print "t ", objectName($1), " {50,200,50} (Parked $2, $3)\n";
}
elsif (/Synchronous call:/) {
--- a/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/bld.inf Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/bld.inf Mon Oct 04 02:21:43 2010 +0300
@@ -13,6 +13,11 @@
// Description:
//
+PRJ_EXPORTS
+createcommdbs.meta /epoc32/tools/makefile_templates/converged-comms/createcommdbs.meta
+createcommdbs.mk /epoc32/tools/makefile_templates/converged-comms/createcommdbs.mk
+
+
PRJ_PLATFORMS
DEFAULT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/createcommdbs.meta Mon Oct 04 02:21:43 2010 +0300
@@ -0,0 +1,213 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+
+<head>
+ <script type="text/javascript">
+
+ function urlEncode (str) {
+ len = str.length;
+ res = new String();
+ charOrd = new Number();
+
+ for (i = 0; i < len; i++) {
+ charOrd = str.charCodeAt(i);
+ if ((charOrd >= 65 && charOrd <= 90) || (charOrd >= 97 && charOrd <= 122) || (charOrd >= 48 && charOrd <= 57) || (charOrd == 33) || (charOrd == 36) || (charOrd == 95)) {
+ // this is alphanumeric or $-_.+!*'(), which according to RFC1738 we don't escape
+ res += str.charAt(i);
+
+ }
+ else {
+ res += '%';
+ if (charOrd > 255) res += 'u';
+ hexValStr = charOrd.toString(16);
+ if ((hexValStr.length) % 2 == 1) hexValStr = '0' + hexValStr;
+ res += hexValStr;
+ }
+ }
+
+ return res;
+ }
+
+
+</script>
+
+<title>S60 Cross Referencer: mcl_201032_hw79</title>
+<meta http-equiv="X-UA-Compatible" content="IE=7">
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<link rel="icon" href="/matrix.ico" type="image/x-icon">
+<link rel="stylesheet" type="text/css" href="/css/global.css" media="all" />
+<link href="/css/lxr.css" rel="STYLESHEET" type="text/css">
+<link rel="alternate" type="application/rss+xml" title="Indexed builds feed" href="/rss/all.xml" />
+</head>
+
+<body>
+<center>
+ <div id="header">
+ <div id="container">
+ <div id="rounded-top" class="lu-round"><div class="ru-round"> </div><div class="center"> </div></div>
+ <div id="h">
+ <div id="logo">
+ <a href="http://s60lxr.europe.nokia.com/"><img src="/img/LXR_logo2.gif" /></a>
+ </div>
+ <div id="toolmenu"><a href="http://s60dashboard.europe.nokia.com/">LiveStream</a><br><a href="http://diamonds.europe.nokia.com/diamonds/">Diamonds</a><br><a href="http://gaia.europe.nokia.com/">Gaia</a><br></div>
+ <div id="toolmenu2">
+ <div id="userinfo"> | <a href="mailto:I_EXT_LXR_ALL@mgd.nokia.com">Feedback</a></div>
+ <div id="search-div">
+ <form method="get" action="/search">
+ <input type="text" name="string" id="searchinput" class="txt" value="" />
+ <img class="img" onclick="window.location = '/search?filestring=&string=' + urlEncode(getElementById('searchinput').value);" src="/img/icon_search.gif" style="border-width:0px;" />
+ </form>
+ </div>
+ <div id="webtools" style="" >by <a href="http://s60dashboard.europe.nokia.com/webtools/">webtools</a></div>
+ </div>
+ </div>
+ <div id="rounded-bottom" class="lb-round"><div class="rb-round"> </div><div class="center-b"> </div></div>
+ </div>
+ </div>
+</center>
+ <div id="classification"><p>Company confidential</p></div>
+<div id="content">
+
+
+
+
+<table width='100%' border='0' cellpadding='0' cellspacing='0'>
+ <tr>
+ <td valign='top'>
+ <!-- put local logo or links here -->
+ </td>
+ <td>
+ <table width='100%' border='0' cellpadding='0' cellspacing='0'>
+ <tr>
+ <td align="center"><span class="banner"><a class='banner' href="/source/?v=mcl_201032_hw79">mcl_201032_hw79</a>/ <a class='banner' href="/source/sf/?v=mcl_201032_hw79">sf</a>/ <a class='banner' href="/source/sf/os/?v=mcl_201032_hw79">os</a>/ <a class='banner' href="/source/sf/os/buildtools/?v=mcl_201032_hw79">buildtools</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/?v=mcl_201032_hw79">toolsandutils</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/?v=mcl_201032_hw79">buildsystem</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/?v=mcl_201032_hw79">extension</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/?v=mcl_201032_hw79">converged-comms</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79">createcommdbs.meta</a></span></td>
+ </tr>
+ </table>
+ </td>
+ <td align='right'>
+
+ [ <span class='modes-sel'>source navigation</span> ]<br>
+ [ <a class='modes' href="/diff/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79">diff markup</a> ]<br>
+ [ <a class='modes' href="/ident?v=mcl_201032_hw79">identifier search</a> ]<br>
+ [ <a class="modes" href="/search?v=mcl_201032_hw79">general search</a> ]<br>
+ </td>
+ </tr>
+ <tr><td colspan='3'> </td></tr>
+ <tr>
+ <td colspan='3'>
+ <table width="100%" border="0" cellpadding='0' cellspacing='3' class="vartable">
+
+ <tr valign="top" align="left">
+ <th> DFS7x.92 <a href="/rss/DFS7x.92.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> MCL - DFS7x.01 <a href="/rss/DFS7x.01.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> S60_3_23 <a href="/rss/S60_3_23.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> pf_5250 <a href="/rss/pf_5250.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> requested <a href="/rss/requested.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th></tr>
+ <tr valign="top">
+
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=92_201033_hw79">92_201033_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=92ps1_201033_hw79">92ps1_201033_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=92att_201033_hw79">92att_201033_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=92_201032_hw79">92_201032_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=92ps1_201032_hw79">92ps1_201032_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=92att_201032_hw79">92att_201032_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=92_201030_hw79">92_201030_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=92ps1_201030_hw79">92ps1_201030_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=92_201022_hw79">92_201022_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=92_201012_hw79">92_201012_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201002_hw79">mcl_201002_hw79</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <span class="var-sel">mcl_201032_hw79</span> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201030_hw79">mcl_201030_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201028_hw79">mcl_201028_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201026_hw79">mcl_201026_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201020_hw79">mcl_201020_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201012_hw79">mcl_201012_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201004_hw79">mcl_201004_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl.01_201002_hw79">mcl.01_201002_hw79</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=S60_3_23_201024_RnD_gadget">S60_3_23_201024_RnD_gadget</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=S60_3_23_201022_RnD_gadget">S60_3_23_201022_RnD_gadget</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=S60_3_23_201010_RnD_gadget">S60_3_23_201010_RnD_gadget</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=S60_3_23_201002_RnD_gadget">S60_3_23_201002_RnD_gadget</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=pf_5250_prd_30.0.029">pf_5250_prd_30.0.029</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=pf_5250_prd_30.0.028">pf_5250_prd_30.0.028</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=pf_5250_prd_30.0.004">pf_5250_prd_30.0.004</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=pf_5250_201012">pf_5250_201012</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=pf_5250_201002">pf_5250_201002</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=NCP79_92_10w33_RC1">NCP79_92_10w33_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=NCP79_92ps1_10w33_RC1">NCP79_92ps1_10w33_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=NCP79_92att_10w33_RC1">NCP79_92att_10w33_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=NCP_TB10.1.10w32.013">NCP_TB10.1.10w32.013</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=NCP79_92_10w32_RC1">NCP79_92_10w32_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=NCP79_92ps1_10w32_RC1">NCP79_92ps1_10w32_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=NCP79_92att_10w32_RC1">NCP79_92att_10w32_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=NCP110_10w32_RC">NCP110_10w32_RC</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=NCP110_10w30_RC2">NCP110_10w30_RC2</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=dfs110_11001_201028_hw110">dfs110_11001_201028_hw110</a> ]<br>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+
+<hr>
+<pre class="file">
+<a name=001 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#001">001</a> # Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+<a name=002 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#002">002</a> # All rights reserved.
+<a name=003 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#003">003</a> # This component and the accompanying materials are made available
+<a name=004 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#004">004</a> # under the terms of "Eclipse Public License v1.0"
+<a name=005 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#005">005</a> # which accompanies this distribution, and is available
+<a name=006 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#006">006</a> # at the URL "<a class='offshore' href="http://www.eclipse.org/legal/epl-v10.html"">http://www.eclipse.org/legal/epl-v10.html"</a>.
+<a name=007 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#007">007</a> #
+<a name=008 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#008">008</a> # Initial Contributors:
+<a name=009 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#009">009</a> # Nokia Corporation - initial contribution.
+<a name=010 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#010">010</a> #
+<a name=011 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#011">011</a> # Contributors:
+<a name=012 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#012">012</a> #
+<a name=013 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#013">013</a> # Description:
+<a name=014 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#014">014</a> # Meta information for PDR generation
+<a name=015 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#015">015</a> #
+<a name=016 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#016">016</a>
+<a name=017 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#017">017</a> platform win32
+<a name=018 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#018">018</a> makefile gnumake
+<a name=019 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#019">019</a> techstream converged-comms
+<a name=020 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79#020">020</a>
+</pre>
+<hr>
+<table width="100%" cellpadding="0" border="0">
+ <tr valign="middle">
+
+ <td align="center" nowrap="nowrap">
+ [ <span class='modes-sel'>source navigation</span> ]</td>
+ <td align="center" nowrap="nowrap">
+ [ <a class='modes' href="/diff/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.meta?v=mcl_201032_hw79">diff markup</a> ]</td>
+ <td align="center" nowrap="nowrap">
+ [ <a class='modes' href="/ident?v=mcl_201032_hw79">identifier search</a> ]</td>
+ <td align="center" nowrap="nowrap">
+ [ <a class="modes" href="/search?v=mcl_201032_hw79">general search</a> ]</td>
+ </tr>
+</table>
+<hr>
+<table width="100%" cellpadding="0" border="0">
+ <tr>
+ <td align="left">
+ This page was automatically generated by the
+ <a href="http://lxr.sf.net/">LXR engine</a>.
+ <br>And brought to you by the
+ <a href="http://wikis.in.nokia.com/AMPIwiki/DeliveryTools">Delivery Tools</a>.
+ </td>
+ </tr>
+</table>
+</div>
+</body>
+</html>
+Current status: ready
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwtools/preparedefaultcommsdatabase/defaultcommdb/group/createcommdbs.mk Mon Oct 04 02:21:43 2010 +0300
@@ -0,0 +1,242 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+
+<head>
+ <script type="text/javascript">
+
+ function urlEncode (str) {
+ len = str.length;
+ res = new String();
+ charOrd = new Number();
+
+ for (i = 0; i < len; i++) {
+ charOrd = str.charCodeAt(i);
+ if ((charOrd >= 65 && charOrd <= 90) || (charOrd >= 97 && charOrd <= 122) || (charOrd >= 48 && charOrd <= 57) || (charOrd == 33) || (charOrd == 36) || (charOrd == 95)) {
+ // this is alphanumeric or $-_.+!*'(), which according to RFC1738 we don't escape
+ res += str.charAt(i);
+
+ }
+ else {
+ res += '%';
+ if (charOrd > 255) res += 'u';
+ hexValStr = charOrd.toString(16);
+ if ((hexValStr.length) % 2 == 1) hexValStr = '0' + hexValStr;
+ res += hexValStr;
+ }
+ }
+
+ return res;
+ }
+
+
+</script>
+
+<title>S60 Cross Referencer: mcl_201032_hw79</title>
+<meta http-equiv="X-UA-Compatible" content="IE=7">
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<link rel="icon" href="/matrix.ico" type="image/x-icon">
+<link rel="stylesheet" type="text/css" href="/css/global.css" media="all" />
+<link href="/css/lxr.css" rel="STYLESHEET" type="text/css">
+<link rel="alternate" type="application/rss+xml" title="Indexed builds feed" href="/rss/all.xml" />
+</head>
+
+<body>
+<center>
+ <div id="header">
+ <div id="container">
+ <div id="rounded-top" class="lu-round"><div class="ru-round"> </div><div class="center"> </div></div>
+ <div id="h">
+ <div id="logo">
+ <a href="http://s60lxr.europe.nokia.com/"><img src="/img/LXR_logo2.gif" /></a>
+ </div>
+ <div id="toolmenu"><a href="http://s60dashboard.europe.nokia.com/">LiveStream</a><br><a href="http://diamonds.europe.nokia.com/diamonds/">Diamonds</a><br><a href="http://gaia.europe.nokia.com/">Gaia</a><br></div>
+ <div id="toolmenu2">
+ <div id="userinfo"> | <a href="mailto:I_EXT_LXR_ALL@mgd.nokia.com">Feedback</a></div>
+ <div id="search-div">
+ <form method="get" action="/search">
+ <input type="text" name="string" id="searchinput" class="txt" value="" />
+ <img class="img" onclick="window.location = '/search?filestring=&string=' + urlEncode(getElementById('searchinput').value);" src="/img/icon_search.gif" style="border-width:0px;" />
+ </form>
+ </div>
+ <div id="webtools" style="" >by <a href="http://s60dashboard.europe.nokia.com/webtools/">webtools</a></div>
+ </div>
+ </div>
+ <div id="rounded-bottom" class="lb-round"><div class="rb-round"> </div><div class="center-b"> </div></div>
+ </div>
+ </div>
+</center>
+ <div id="classification"><p>Company confidential</p></div>
+<div id="content">
+
+
+
+
+<table width='100%' border='0' cellpadding='0' cellspacing='0'>
+ <tr>
+ <td valign='top'>
+ <!-- put local logo or links here -->
+ </td>
+ <td>
+ <table width='100%' border='0' cellpadding='0' cellspacing='0'>
+ <tr>
+ <td align="center"><span class="banner"><a class='banner' href="/source/?v=mcl_201032_hw79">mcl_201032_hw79</a>/ <a class='banner' href="/source/sf/?v=mcl_201032_hw79">sf</a>/ <a class='banner' href="/source/sf/os/?v=mcl_201032_hw79">os</a>/ <a class='banner' href="/source/sf/os/buildtools/?v=mcl_201032_hw79">buildtools</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/?v=mcl_201032_hw79">toolsandutils</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/?v=mcl_201032_hw79">buildsystem</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/?v=mcl_201032_hw79">extension</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/?v=mcl_201032_hw79">converged-comms</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79">createcommdbs.mk</a></span></td>
+ </tr>
+ </table>
+ </td>
+ <td align='right'>
+
+ [ <span class='modes-sel'>source navigation</span> ]<br>
+ [ <a class='modes' href="/diff/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79">diff markup</a> ]<br>
+ [ <a class='modes' href="/ident?v=mcl_201032_hw79">identifier search</a> ]<br>
+ [ <a class="modes" href="/search?v=mcl_201032_hw79">general search</a> ]<br>
+ </td>
+ </tr>
+ <tr><td colspan='3'> </td></tr>
+ <tr>
+ <td colspan='3'>
+ <table width="100%" border="0" cellpadding='0' cellspacing='3' class="vartable">
+
+ <tr valign="top" align="left">
+ <th> DFS7x.92 <a href="/rss/DFS7x.92.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> MCL - DFS7x.01 <a href="/rss/DFS7x.01.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> S60_3_23 <a href="/rss/S60_3_23.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> pf_5250 <a href="/rss/pf_5250.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> requested <a href="/rss/requested.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th></tr>
+ <tr valign="top">
+
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=92_201033_hw79">92_201033_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=92ps1_201033_hw79">92ps1_201033_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=92att_201033_hw79">92att_201033_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=92_201032_hw79">92_201032_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=92ps1_201032_hw79">92ps1_201032_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=92att_201032_hw79">92att_201032_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=92_201030_hw79">92_201030_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=92ps1_201030_hw79">92ps1_201030_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=92_201022_hw79">92_201022_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=92_201012_hw79">92_201012_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201002_hw79">mcl_201002_hw79</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <span class="var-sel">mcl_201032_hw79</span> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201030_hw79">mcl_201030_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201028_hw79">mcl_201028_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201026_hw79">mcl_201026_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201020_hw79">mcl_201020_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201012_hw79">mcl_201012_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201004_hw79">mcl_201004_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl.01_201002_hw79">mcl.01_201002_hw79</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=S60_3_23_201024_RnD_gadget">S60_3_23_201024_RnD_gadget</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=S60_3_23_201022_RnD_gadget">S60_3_23_201022_RnD_gadget</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=S60_3_23_201010_RnD_gadget">S60_3_23_201010_RnD_gadget</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=S60_3_23_201002_RnD_gadget">S60_3_23_201002_RnD_gadget</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=pf_5250_prd_30.0.029">pf_5250_prd_30.0.029</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=pf_5250_prd_30.0.028">pf_5250_prd_30.0.028</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=pf_5250_prd_30.0.004">pf_5250_prd_30.0.004</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=pf_5250_201012">pf_5250_201012</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=pf_5250_201002">pf_5250_201002</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=NCP79_92_10w33_RC1">NCP79_92_10w33_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=NCP79_92ps1_10w33_RC1">NCP79_92ps1_10w33_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=NCP79_92att_10w33_RC1">NCP79_92att_10w33_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=NCP_TB10.1.10w32.013">NCP_TB10.1.10w32.013</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=NCP79_92_10w32_RC1">NCP79_92_10w32_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=NCP79_92ps1_10w32_RC1">NCP79_92ps1_10w32_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=NCP79_92att_10w32_RC1">NCP79_92att_10w32_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=NCP110_10w32_RC">NCP110_10w32_RC</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=NCP110_10w30_RC2">NCP110_10w30_RC2</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=dfs110_11001_201028_hw110">dfs110_11001_201028_hw110</a> ]<br>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+
+<hr>
+<pre class="file">
+<a name=001 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#001">001</a> <span class="comment"># Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).</span>
+<a name=002 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#002">002</a> <span class="comment"></span><span class="comment"># All rights reserved.</span>
+<a name=003 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#003">003</a> <span class="comment"></span><span class="comment"># This component and the accompanying materials are made available</span>
+<a name=004 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#004">004</a> <span class="comment"></span><span class="comment"># under the terms of "Eclipse Public License v1.0"</span>
+<a name=005 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#005">005</a> <span class="comment"></span><span class="comment"># which accompanies this distribution, and is available</span>
+<a name=006 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#006">006</a> <span class="comment"></span><span class="comment"># at the URL "<a class='offshore' href="http://www.eclipse.org/legal/epl-v10.html"">http://www.eclipse.org/legal/epl-v10.html"</a>.</span>
+<a name=007 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#007">007</a> <span class="comment"></span><span class="comment">#</span>
+<a name=008 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#008">008</a> <span class="comment"></span><span class="comment"># Initial Contributors:</span>
+<a name=009 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#009">009</a> <span class="comment"></span><span class="comment"># Nokia Corporation - initial contribution.</span>
+<a name=010 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#010">010</a> <span class="comment"></span><span class="comment">#</span>
+<a name=011 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#011">011</a> <span class="comment"></span><span class="comment"># Contributors:</span>
+<a name=012 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#012">012</a> <span class="comment"></span><span class="comment">#</span>
+<a name=013 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#013">013</a> <span class="comment"></span><span class="comment"># Description:</span>
+<a name=014 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#014">014</a> <span class="comment"></span><span class="comment"># Envoke CED to create correct CommDB</span>
+<a name=015 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#015">015</a> <span class="comment"></span><span class="comment"># </span>
+<a name=016 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#016">016</a> <span class="comment"></span><span class="comment">#</span>
+<a name=017 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#017">017</a> <span class="comment"></span>
+<a name=018 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#018">018</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a> :
+<a name=019 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#019">019</a>
+<a name=020 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#020">020</a>
+<a name=021 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#021">021</a> <span class="comment">#</span>
+<a name=022 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#022">022</a> <span class="comment"></span><span class="comment"># The targets invoked by abld </span>
+<a name=023 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#023">023</a> <span class="comment"></span><span class="comment">#</span>
+<a name=024 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#024">024</a> <span class="comment"></span>
+<a name=025 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#025">025</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=MAKMAKE">MAKMAKE</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=026 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#026">026</a>
+<a name=027 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#027">027</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=RESOURCE">RESOURCE</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=028 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#028">028</a>
+<a name=029 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#029">029</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=SAVESPACE">SAVESPACE</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=BLD">BLD</a>
+<a name=030 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#030">030</a>
+<a name=031 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#031">031</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=BLD">BLD</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=032 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#032">032</a>
+<a name=033 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#033">033</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=FREEZE">FREEZE</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=034 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#034">034</a>
+<a name=035 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#035">035</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=LIB">LIB</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=036 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#036">036</a>
+<a name=037 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#037">037</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=CLEANLIB">CLEANLIB</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=038 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#038">038</a>
+<a name=039 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#039">039</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=FINAL">FINAL</a> :
+<a name=040 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#040">040</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=perl">perl</a> $(<a class='fid' href="/ident?v=mcl_201032_hw79;i=EXTENSION_ROOT">EXTENSION_ROOT</a>)/<a class='fid' href="/ident?v=mcl_201032_hw79;i=createcommdbs">createcommdbs</a>.<a class='fid' href="/ident?v=mcl_201032_hw79;i=pl">pl</a> --<a class='fid' href="/ident?v=mcl_201032_hw79;i=command">command</a>=<a class='fid' href="/ident?v=mcl_201032_hw79;i=build">build</a> --<a class='fid' href="/ident?v=mcl_201032_hw79;i=platform">platform</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=PLATFORM">PLATFORM</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=variant">variant</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=CFG">CFG</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=sourceDir">sourceDir</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=EXTENSION_ROOT">EXTENSION_ROOT</a>)/$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=SRCDIR">SRCDIR</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=platsec">platsec</a>
+<a name=041 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#041">041</a>
+<a name=042 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#042">042</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=CLEAN">CLEAN</a> :
+<a name=043 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#043">043</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=perl">perl</a> $(<a class='fid' href="/ident?v=mcl_201032_hw79;i=EXTENSION_ROOT">EXTENSION_ROOT</a>)/<a class='fid' href="/ident?v=mcl_201032_hw79;i=createcommdbs">createcommdbs</a>.<a class='fid' href="/ident?v=mcl_201032_hw79;i=pl">pl</a> --<a class='fid' href="/ident?v=mcl_201032_hw79;i=command">command</a>=<a class='fid' href="/ident?v=mcl_201032_hw79;i=clean">clean</a> --<a class='fid' href="/ident?v=mcl_201032_hw79;i=platform">platform</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=PLATFORM">PLATFORM</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=variant">variant</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=CFG">CFG</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=sourceDir">sourceDir</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=EXTENSION_ROOT">EXTENSION_ROOT</a>)/$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=SRCDIR">SRCDIR</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=platsec">platsec</a>
+<a name=044 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#044">044</a>
+<a name=045 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#045">045</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=RELEASABLES">RELEASABLES</a> :
+<a name=046 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#046">046</a> @<a class='fid' href="/ident?v=mcl_201032_hw79;i=perl">perl</a> $(<a class='fid' href="/ident?v=mcl_201032_hw79;i=EXTENSION_ROOT">EXTENSION_ROOT</a>)/<a class='fid' href="/ident?v=mcl_201032_hw79;i=createcommdbs">createcommdbs</a>.<a class='fid' href="/ident?v=mcl_201032_hw79;i=pl">pl</a> --<a class='fid' href="/ident?v=mcl_201032_hw79;i=command">command</a>=<a class='fid' href="/ident?v=mcl_201032_hw79;i=releasables">releasables</a> --<a class='fid' href="/ident?v=mcl_201032_hw79;i=platform">platform</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=PLATFORM">PLATFORM</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=variant">variant</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=CFG">CFG</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=sourceDir">sourceDir</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=EXTENSION_ROOT">EXTENSION_ROOT</a>)/$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=SRCDIR">SRCDIR</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=platsec">platsec</a>
+<a name=047 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#047">047</a>
+<a name=048 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#048">048</a>
+<a name=049 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#049">049</a>
+<a name=050 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79#050">050</a> </pre>
+<hr>
+<table width="100%" cellpadding="0" border="0">
+ <tr valign="middle">
+
+ <td align="center" nowrap="nowrap">
+ [ <span class='modes-sel'>source navigation</span> ]</td>
+ <td align="center" nowrap="nowrap">
+ [ <a class='modes' href="/diff/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/createcommdbs.mk?v=mcl_201032_hw79">diff markup</a> ]</td>
+ <td align="center" nowrap="nowrap">
+ [ <a class='modes' href="/ident?v=mcl_201032_hw79">identifier search</a> ]</td>
+ <td align="center" nowrap="nowrap">
+ [ <a class="modes" href="/search?v=mcl_201032_hw79">general search</a> ]</td>
+ </tr>
+</table>
+<hr>
+<table width="100%" cellpadding="0" border="0">
+ <tr>
+ <td align="left">
+ This page was automatically generated by the
+ <a href="http://lxr.sf.net/">LXR engine</a>.
+ <br>And brought to you by the
+ <a href="http://wikis.in.nokia.com/AMPIwiki/DeliveryTools">Delivery Tools</a>.
+ </td>
+ </tr>
+</table>
+</div>
+</body>
+</html>
+Current status: ready
\ No newline at end of file
--- a/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/bld.inf Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/bld.inf Mon Oct 04 02:21:43 2010 +0300
@@ -13,6 +13,10 @@
// Description:
//
+PRJ_EXPORTS
+installdefaultcommdb.meta /epoc32/tools/makefile_templates/converged-comms/installdefaultcommdb.meta
+installdefaultcommdb.mk /epoc32/tools/makefile_templates/converged-comms/installdefaultcommdb.mk
+
PRJ_PLATFORMS
DEFAULT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/installdefaultcommdb.meta Mon Oct 04 02:21:43 2010 +0300
@@ -0,0 +1,213 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+
+<head>
+ <script type="text/javascript">
+
+ function urlEncode (str) {
+ len = str.length;
+ res = new String();
+ charOrd = new Number();
+
+ for (i = 0; i < len; i++) {
+ charOrd = str.charCodeAt(i);
+ if ((charOrd >= 65 && charOrd <= 90) || (charOrd >= 97 && charOrd <= 122) || (charOrd >= 48 && charOrd <= 57) || (charOrd == 33) || (charOrd == 36) || (charOrd == 95)) {
+ // this is alphanumeric or $-_.+!*'(), which according to RFC1738 we don't escape
+ res += str.charAt(i);
+
+ }
+ else {
+ res += '%';
+ if (charOrd > 255) res += 'u';
+ hexValStr = charOrd.toString(16);
+ if ((hexValStr.length) % 2 == 1) hexValStr = '0' + hexValStr;
+ res += hexValStr;
+ }
+ }
+
+ return res;
+ }
+
+
+</script>
+
+<title>S60 Cross Referencer: mcl_201032_hw79</title>
+<meta http-equiv="X-UA-Compatible" content="IE=7">
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<link rel="icon" href="/matrix.ico" type="image/x-icon">
+<link rel="stylesheet" type="text/css" href="/css/global.css" media="all" />
+<link href="/css/lxr.css" rel="STYLESHEET" type="text/css">
+<link rel="alternate" type="application/rss+xml" title="Indexed builds feed" href="/rss/all.xml" />
+</head>
+
+<body>
+<center>
+ <div id="header">
+ <div id="container">
+ <div id="rounded-top" class="lu-round"><div class="ru-round"> </div><div class="center"> </div></div>
+ <div id="h">
+ <div id="logo">
+ <a href="http://s60lxr.europe.nokia.com/"><img src="/img/LXR_logo2.gif" /></a>
+ </div>
+ <div id="toolmenu"><a href="http://s60dashboard.europe.nokia.com/">LiveStream</a><br><a href="http://diamonds.europe.nokia.com/diamonds/">Diamonds</a><br><a href="http://gaia.europe.nokia.com/">Gaia</a><br></div>
+ <div id="toolmenu2">
+ <div id="userinfo"> | <a href="mailto:I_EXT_LXR_ALL@mgd.nokia.com">Feedback</a></div>
+ <div id="search-div">
+ <form method="get" action="/search">
+ <input type="text" name="string" id="searchinput" class="txt" value="" />
+ <img class="img" onclick="window.location = '/search?filestring=&string=' + urlEncode(getElementById('searchinput').value);" src="/img/icon_search.gif" style="border-width:0px;" />
+ </form>
+ </div>
+ <div id="webtools" style="" >by <a href="http://s60dashboard.europe.nokia.com/webtools/">webtools</a></div>
+ </div>
+ </div>
+ <div id="rounded-bottom" class="lb-round"><div class="rb-round"> </div><div class="center-b"> </div></div>
+ </div>
+ </div>
+</center>
+ <div id="classification"><p>Company confidential</p></div>
+<div id="content">
+
+
+
+
+<table width='100%' border='0' cellpadding='0' cellspacing='0'>
+ <tr>
+ <td valign='top'>
+ <!-- put local logo or links here -->
+ </td>
+ <td>
+ <table width='100%' border='0' cellpadding='0' cellspacing='0'>
+ <tr>
+ <td align="center"><span class="banner"><a class='banner' href="/source/?v=mcl_201032_hw79">mcl_201032_hw79</a>/ <a class='banner' href="/source/sf/?v=mcl_201032_hw79">sf</a>/ <a class='banner' href="/source/sf/os/?v=mcl_201032_hw79">os</a>/ <a class='banner' href="/source/sf/os/buildtools/?v=mcl_201032_hw79">buildtools</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/?v=mcl_201032_hw79">toolsandutils</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/?v=mcl_201032_hw79">buildsystem</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/?v=mcl_201032_hw79">extension</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/?v=mcl_201032_hw79">converged-comms</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79">installdefaultcommdb.meta</a></span></td>
+ </tr>
+ </table>
+ </td>
+ <td align='right'>
+
+ [ <span class='modes-sel'>source navigation</span> ]<br>
+ [ <a class='modes' href="/diff/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79">diff markup</a> ]<br>
+ [ <a class='modes' href="/ident?v=mcl_201032_hw79">identifier search</a> ]<br>
+ [ <a class="modes" href="/search?v=mcl_201032_hw79">general search</a> ]<br>
+ </td>
+ </tr>
+ <tr><td colspan='3'> </td></tr>
+ <tr>
+ <td colspan='3'>
+ <table width="100%" border="0" cellpadding='0' cellspacing='3' class="vartable">
+
+ <tr valign="top" align="left">
+ <th> DFS7x.92 <a href="/rss/DFS7x.92.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> MCL - DFS7x.01 <a href="/rss/DFS7x.01.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> S60_3_23 <a href="/rss/S60_3_23.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> pf_5250 <a href="/rss/pf_5250.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> requested <a href="/rss/requested.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th></tr>
+ <tr valign="top">
+
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=92_201033_hw79">92_201033_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=92ps1_201033_hw79">92ps1_201033_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=92att_201033_hw79">92att_201033_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=92_201032_hw79">92_201032_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=92ps1_201032_hw79">92ps1_201032_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=92att_201032_hw79">92att_201032_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=92_201030_hw79">92_201030_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=92ps1_201030_hw79">92ps1_201030_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=92_201022_hw79">92_201022_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=92_201012_hw79">92_201012_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201002_hw79">mcl_201002_hw79</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <span class="var-sel">mcl_201032_hw79</span> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201030_hw79">mcl_201030_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201028_hw79">mcl_201028_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201026_hw79">mcl_201026_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201020_hw79">mcl_201020_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201012_hw79">mcl_201012_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201004_hw79">mcl_201004_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl.01_201002_hw79">mcl.01_201002_hw79</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=S60_3_23_201024_RnD_gadget">S60_3_23_201024_RnD_gadget</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=S60_3_23_201022_RnD_gadget">S60_3_23_201022_RnD_gadget</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=S60_3_23_201010_RnD_gadget">S60_3_23_201010_RnD_gadget</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=S60_3_23_201002_RnD_gadget">S60_3_23_201002_RnD_gadget</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=pf_5250_prd_30.0.029">pf_5250_prd_30.0.029</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=pf_5250_prd_30.0.028">pf_5250_prd_30.0.028</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=pf_5250_prd_30.0.004">pf_5250_prd_30.0.004</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=pf_5250_201012">pf_5250_201012</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=pf_5250_201002">pf_5250_201002</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=NCP79_92_10w33_RC1">NCP79_92_10w33_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=NCP79_92ps1_10w33_RC1">NCP79_92ps1_10w33_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=NCP79_92att_10w33_RC1">NCP79_92att_10w33_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=NCP_TB10.1.10w32.013">NCP_TB10.1.10w32.013</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=NCP79_92_10w32_RC1">NCP79_92_10w32_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=NCP79_92ps1_10w32_RC1">NCP79_92ps1_10w32_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=NCP79_92att_10w32_RC1">NCP79_92att_10w32_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=NCP110_10w32_RC">NCP110_10w32_RC</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=NCP110_10w30_RC2">NCP110_10w30_RC2</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=dfs110_11001_201028_hw110">dfs110_11001_201028_hw110</a> ]<br>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+
+<hr>
+<pre class="file">
+<a name=001 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#001">001</a> # Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+<a name=002 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#002">002</a> # All rights reserved.
+<a name=003 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#003">003</a> # This component and the accompanying materials are made available
+<a name=004 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#004">004</a> # under the terms of "Eclipse Public License v1.0"
+<a name=005 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#005">005</a> # which accompanies this distribution, and is available
+<a name=006 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#006">006</a> # at the URL "<a class='offshore' href="http://www.eclipse.org/legal/epl-v10.html"">http://www.eclipse.org/legal/epl-v10.html"</a>.
+<a name=007 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#007">007</a> #
+<a name=008 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#008">008</a> # Initial Contributors:
+<a name=009 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#009">009</a> # Nokia Corporation - initial contribution.
+<a name=010 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#010">010</a> #
+<a name=011 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#011">011</a> # Contributors:
+<a name=012 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#012">012</a> #
+<a name=013 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#013">013</a> # Description:
+<a name=014 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#014">014</a> # Meta information for PDR generation
+<a name=015 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#015">015</a> #
+<a name=016 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#016">016</a>
+<a name=017 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#017">017</a> platform win32
+<a name=018 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#018">018</a> makefile gnumake
+<a name=019 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#019">019</a> techstream converged-comms
+<a name=020 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79#020">020</a>
+</pre>
+<hr>
+<table width="100%" cellpadding="0" border="0">
+ <tr valign="middle">
+
+ <td align="center" nowrap="nowrap">
+ [ <span class='modes-sel'>source navigation</span> ]</td>
+ <td align="center" nowrap="nowrap">
+ [ <a class='modes' href="/diff/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.meta?v=mcl_201032_hw79">diff markup</a> ]</td>
+ <td align="center" nowrap="nowrap">
+ [ <a class='modes' href="/ident?v=mcl_201032_hw79">identifier search</a> ]</td>
+ <td align="center" nowrap="nowrap">
+ [ <a class="modes" href="/search?v=mcl_201032_hw79">general search</a> ]</td>
+ </tr>
+</table>
+<hr>
+<table width="100%" cellpadding="0" border="0">
+ <tr>
+ <td align="left">
+ This page was automatically generated by the
+ <a href="http://lxr.sf.net/">LXR engine</a>.
+ <br>And brought to you by the
+ <a href="http://wikis.in.nokia.com/AMPIwiki/DeliveryTools">Delivery Tools</a>.
+ </td>
+ </tr>
+</table>
+</div>
+</body>
+</html>
+Current status: ready
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/commsfwtools/preparedefaultcommsdatabase/installdefaultcommdb/group/installdefaultcommdb.mk Mon Oct 04 02:21:43 2010 +0300
@@ -0,0 +1,240 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+
+<head>
+ <script type="text/javascript">
+
+ function urlEncode (str) {
+ len = str.length;
+ res = new String();
+ charOrd = new Number();
+
+ for (i = 0; i < len; i++) {
+ charOrd = str.charCodeAt(i);
+ if ((charOrd >= 65 && charOrd <= 90) || (charOrd >= 97 && charOrd <= 122) || (charOrd >= 48 && charOrd <= 57) || (charOrd == 33) || (charOrd == 36) || (charOrd == 95)) {
+ // this is alphanumeric or $-_.+!*'(), which according to RFC1738 we don't escape
+ res += str.charAt(i);
+
+ }
+ else {
+ res += '%';
+ if (charOrd > 255) res += 'u';
+ hexValStr = charOrd.toString(16);
+ if ((hexValStr.length) % 2 == 1) hexValStr = '0' + hexValStr;
+ res += hexValStr;
+ }
+ }
+
+ return res;
+ }
+
+
+</script>
+
+<title>S60 Cross Referencer: mcl_201032_hw79</title>
+<meta http-equiv="X-UA-Compatible" content="IE=7">
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<link rel="icon" href="/matrix.ico" type="image/x-icon">
+<link rel="stylesheet" type="text/css" href="/css/global.css" media="all" />
+<link href="/css/lxr.css" rel="STYLESHEET" type="text/css">
+<link rel="alternate" type="application/rss+xml" title="Indexed builds feed" href="/rss/all.xml" />
+</head>
+
+<body>
+<center>
+ <div id="header">
+ <div id="container">
+ <div id="rounded-top" class="lu-round"><div class="ru-round"> </div><div class="center"> </div></div>
+ <div id="h">
+ <div id="logo">
+ <a href="http://s60lxr.europe.nokia.com/"><img src="/img/LXR_logo2.gif" /></a>
+ </div>
+ <div id="toolmenu"><a href="http://s60dashboard.europe.nokia.com/">LiveStream</a><br><a href="http://diamonds.europe.nokia.com/diamonds/">Diamonds</a><br><a href="http://gaia.europe.nokia.com/">Gaia</a><br></div>
+ <div id="toolmenu2">
+ <div id="userinfo"> | <a href="mailto:I_EXT_LXR_ALL@mgd.nokia.com">Feedback</a></div>
+ <div id="search-div">
+ <form method="get" action="/search">
+ <input type="text" name="string" id="searchinput" class="txt" value="" />
+ <img class="img" onclick="window.location = '/search?filestring=&string=' + urlEncode(getElementById('searchinput').value);" src="/img/icon_search.gif" style="border-width:0px;" />
+ </form>
+ </div>
+ <div id="webtools" style="" >by <a href="http://s60dashboard.europe.nokia.com/webtools/">webtools</a></div>
+ </div>
+ </div>
+ <div id="rounded-bottom" class="lb-round"><div class="rb-round"> </div><div class="center-b"> </div></div>
+ </div>
+ </div>
+</center>
+ <div id="classification"><p>Company confidential</p></div>
+<div id="content">
+
+
+
+
+<table width='100%' border='0' cellpadding='0' cellspacing='0'>
+ <tr>
+ <td valign='top'>
+ <!-- put local logo or links here -->
+ </td>
+ <td>
+ <table width='100%' border='0' cellpadding='0' cellspacing='0'>
+ <tr>
+ <td align="center"><span class="banner"><a class='banner' href="/source/?v=mcl_201032_hw79">mcl_201032_hw79</a>/ <a class='banner' href="/source/sf/?v=mcl_201032_hw79">sf</a>/ <a class='banner' href="/source/sf/os/?v=mcl_201032_hw79">os</a>/ <a class='banner' href="/source/sf/os/buildtools/?v=mcl_201032_hw79">buildtools</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/?v=mcl_201032_hw79">toolsandutils</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/?v=mcl_201032_hw79">buildsystem</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/?v=mcl_201032_hw79">extension</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/?v=mcl_201032_hw79">converged-comms</a>/ <a class='banner' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79">installdefaultcommdb.mk</a></span></td>
+ </tr>
+ </table>
+ </td>
+ <td align='right'>
+
+ [ <span class='modes-sel'>source navigation</span> ]<br>
+ [ <a class='modes' href="/diff/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79">diff markup</a> ]<br>
+ [ <a class='modes' href="/ident?v=mcl_201032_hw79">identifier search</a> ]<br>
+ [ <a class="modes" href="/search?v=mcl_201032_hw79">general search</a> ]<br>
+ </td>
+ </tr>
+ <tr><td colspan='3'> </td></tr>
+ <tr>
+ <td colspan='3'>
+ <table width="100%" border="0" cellpadding='0' cellspacing='3' class="vartable">
+
+ <tr valign="top" align="left">
+ <th> DFS7x.92 <a href="/rss/DFS7x.92.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> MCL - DFS7x.01 <a href="/rss/DFS7x.01.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> S60_3_23 <a href="/rss/S60_3_23.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> pf_5250 <a href="/rss/pf_5250.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th><th> requested <a href="/rss/requested.xml"><img src="/img/feed-icon-14x14.png" class="rsslink" align="right"></a></th></tr>
+ <tr valign="top">
+
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=92_201033_hw79">92_201033_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=92ps1_201033_hw79">92ps1_201033_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=92att_201033_hw79">92att_201033_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=92_201032_hw79">92_201032_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=92ps1_201032_hw79">92ps1_201032_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=92att_201032_hw79">92att_201032_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=92_201030_hw79">92_201030_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=92ps1_201030_hw79">92ps1_201030_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=92_201022_hw79">92_201022_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=92_201012_hw79">92_201012_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201002_hw79">mcl_201002_hw79</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <span class="var-sel">mcl_201032_hw79</span> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201030_hw79">mcl_201030_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201028_hw79">mcl_201028_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201026_hw79">mcl_201026_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201020_hw79">mcl_201020_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201012_hw79">mcl_201012_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201004_hw79">mcl_201004_hw79</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl.01_201002_hw79">mcl.01_201002_hw79</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=S60_3_23_201024_RnD_gadget">S60_3_23_201024_RnD_gadget</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=S60_3_23_201022_RnD_gadget">S60_3_23_201022_RnD_gadget</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=S60_3_23_201010_RnD_gadget">S60_3_23_201010_RnD_gadget</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=S60_3_23_201002_RnD_gadget">S60_3_23_201002_RnD_gadget</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=pf_5250_prd_30.0.029">pf_5250_prd_30.0.029</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=pf_5250_prd_30.0.028">pf_5250_prd_30.0.028</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=pf_5250_prd_30.0.004">pf_5250_prd_30.0.004</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=pf_5250_201012">pf_5250_201012</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=pf_5250_201002">pf_5250_201002</a> ]<br>
+ </td>
+ <td align="left" style="border-left: thin solid; border-color: lightgray">
+
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=NCP79_92_10w33_RC1">NCP79_92_10w33_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=NCP79_92ps1_10w33_RC1">NCP79_92ps1_10w33_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=NCP79_92att_10w33_RC1">NCP79_92att_10w33_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=NCP_TB10.1.10w32.013">NCP_TB10.1.10w32.013</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=NCP79_92_10w32_RC1">NCP79_92_10w32_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=NCP79_92ps1_10w32_RC1">NCP79_92ps1_10w32_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=NCP79_92att_10w32_RC1">NCP79_92att_10w32_RC1</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=NCP110_10w32_RC">NCP110_10w32_RC</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=NCP110_10w30_RC2">NCP110_10w30_RC2</a> ]<br>
+ [ <a class='varlink' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=dfs110_11001_201028_hw110">dfs110_11001_201028_hw110</a> ]<br>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+
+<hr>
+<pre class="file">
+<a name=001 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#001">001</a> <span class="comment"># Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).</span>
+<a name=002 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#002">002</a> <span class="comment"></span><span class="comment"># All rights reserved.</span>
+<a name=003 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#003">003</a> <span class="comment"></span><span class="comment"># This component and the accompanying materials are made available</span>
+<a name=004 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#004">004</a> <span class="comment"></span><span class="comment"># under the terms of "Eclipse Public License v1.0"</span>
+<a name=005 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#005">005</a> <span class="comment"></span><span class="comment"># which accompanies this distribution, and is available</span>
+<a name=006 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#006">006</a> <span class="comment"></span><span class="comment"># at the URL "<a class='offshore' href="http://www.eclipse.org/legal/epl-v10.html"">http://www.eclipse.org/legal/epl-v10.html"</a>.</span>
+<a name=007 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#007">007</a> <span class="comment"></span><span class="comment">#</span>
+<a name=008 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#008">008</a> <span class="comment"></span><span class="comment"># Initial Contributors:</span>
+<a name=009 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#009">009</a> <span class="comment"></span><span class="comment"># Nokia Corporation - initial contribution.</span>
+<a name=010 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#010">010</a> <span class="comment"></span><span class="comment">#</span>
+<a name=011 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#011">011</a> <span class="comment"></span><span class="comment"># Contributors:</span>
+<a name=012 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#012">012</a> <span class="comment"></span><span class="comment">#</span>
+<a name=013 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#013">013</a> <span class="comment"></span><span class="comment"># Description:</span>
+<a name=014 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#014">014</a> <span class="comment"></span><span class="comment"># Envoke CED to install correct CommDB</span>
+<a name=015 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#015">015</a> <span class="comment"></span><span class="comment">#</span>
+<a name=016 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#016">016</a> <span class="comment"></span>
+<a name=017 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#017">017</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a> :
+<a name=018 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#018">018</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=rem">rem</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=019 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#019">019</a>
+<a name=020 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#020">020</a> <span class="comment">#</span>
+<a name=021 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#021">021</a> <span class="comment"></span><span class="comment"># The targets invoked by abld </span>
+<a name=022 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#022">022</a> <span class="comment"></span><span class="comment">#</span>
+<a name=023 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#023">023</a> <span class="comment"></span>
+<a name=024 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#024">024</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=MAKMAKE">MAKMAKE</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=025 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#025">025</a>
+<a name=026 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#026">026</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=RESOURCE">RESOURCE</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=027 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#027">027</a>
+<a name=028 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#028">028</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=SAVESPACE">SAVESPACE</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=BLD">BLD</a>
+<a name=029 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#029">029</a>
+<a name=030 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#030">030</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=BLD">BLD</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=031 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#031">031</a>
+<a name=032 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#032">032</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=FREEZE">FREEZE</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=033 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#033">033</a>
+<a name=034 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#034">034</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=LIB">LIB</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=035 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#035">035</a>
+<a name=036 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#036">036</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=CLEANLIB">CLEANLIB</a> : <a class='fid' href="/ident?v=mcl_201032_hw79;i=do_nothing">do_nothing</a>
+<a name=037 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#037">037</a>
+<a name=038 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#038">038</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=FINAL">FINAL</a> :
+<a name=039 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#039">039</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=perl">perl</a> $(<a class='fid' href="/ident?v=mcl_201032_hw79;i=EXTENSION_ROOT">EXTENSION_ROOT</a>)/<a class='fid' href="/ident?v=mcl_201032_hw79;i=installdefaultcommdb">installdefaultcommdb</a>.<a class='fid' href="/ident?v=mcl_201032_hw79;i=pl">pl</a> --<a class='fid' href="/ident?v=mcl_201032_hw79;i=command">command</a>=<a class='fid' href="/ident?v=mcl_201032_hw79;i=build">build</a> --<a class='fid' href="/ident?v=mcl_201032_hw79;i=platform">platform</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=PLATFORM">PLATFORM</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=variant">variant</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=CFG">CFG</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=platsec">platsec</a>
+<a name=040 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#040">040</a>
+<a name=041 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#041">041</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=CLEAN">CLEAN</a> :
+<a name=042 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#042">042</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=perl">perl</a> $(<a class='fid' href="/ident?v=mcl_201032_hw79;i=EXTENSION_ROOT">EXTENSION_ROOT</a>)/<a class='fid' href="/ident?v=mcl_201032_hw79;i=installdefaultcommdb">installdefaultcommdb</a>.<a class='fid' href="/ident?v=mcl_201032_hw79;i=pl">pl</a> --<a class='fid' href="/ident?v=mcl_201032_hw79;i=command">command</a>=<a class='fid' href="/ident?v=mcl_201032_hw79;i=clean">clean</a> --<a class='fid' href="/ident?v=mcl_201032_hw79;i=platform">platform</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=PLATFORM">PLATFORM</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=variant">variant</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=CFG">CFG</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=platsec">platsec</a>
+<a name=043 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#043">043</a>
+<a name=044 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#044">044</a> <a class='fid' href="/ident?v=mcl_201032_hw79;i=RELEASABLES">RELEASABLES</a> :
+<a name=045 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#045">045</a> @<a class='fid' href="/ident?v=mcl_201032_hw79;i=perl">perl</a> $(<a class='fid' href="/ident?v=mcl_201032_hw79;i=EXTENSION_ROOT">EXTENSION_ROOT</a>)/<a class='fid' href="/ident?v=mcl_201032_hw79;i=installdefaultcommdb">installdefaultcommdb</a>.<a class='fid' href="/ident?v=mcl_201032_hw79;i=pl">pl</a> --<a class='fid' href="/ident?v=mcl_201032_hw79;i=command">command</a>=<a class='fid' href="/ident?v=mcl_201032_hw79;i=releasables">releasables</a> --<a class='fid' href="/ident?v=mcl_201032_hw79;i=platform">platform</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=PLATFORM">PLATFORM</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=variant">variant</a>=$(<a class='fid' href="/ident?v=mcl_201032_hw79;i=CFG">CFG</a>) --<a class='fid' href="/ident?v=mcl_201032_hw79;i=platsec">platsec</a>
+<a name=046 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#046">046</a>
+<a name=047 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#047">047</a>
+<a name=048 class='fline' href="/source/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79#048">048</a> </pre>
+<hr>
+<table width="100%" cellpadding="0" border="0">
+ <tr valign="middle">
+
+ <td align="center" nowrap="nowrap">
+ [ <span class='modes-sel'>source navigation</span> ]</td>
+ <td align="center" nowrap="nowrap">
+ [ <a class='modes' href="/diff/sf/os/buildtools/toolsandutils/buildsystem/extension/converged-comms/installdefaultcommdb.mk?v=mcl_201032_hw79">diff markup</a> ]</td>
+ <td align="center" nowrap="nowrap">
+ [ <a class='modes' href="/ident?v=mcl_201032_hw79">identifier search</a> ]</td>
+ <td align="center" nowrap="nowrap">
+ [ <a class="modes" href="/search?v=mcl_201032_hw79">general search</a> ]</td>
+ </tr>
+</table>
+<hr>
+<table width="100%" cellpadding="0" border="0">
+ <tr>
+ <td align="left">
+ This page was automatically generated by the
+ <a href="http://lxr.sf.net/">LXR engine</a>.
+ <br>And brought to you by the
+ <a href="http://wikis.in.nokia.com/AMPIwiki/DeliveryTools">Delivery Tools</a>.
+ </td>
+ </tr>
+</table>
+</div>
+</body>
+</html>
+Current status: ready
\ No newline at end of file
--- a/commsfwutils/commsbufs/mbufmgr/src/mb_chn.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/commsfwutils/commsbufs/mbufmgr/src/mb_chn.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -618,10 +618,11 @@
return KErrNone;
}
-// overloading for TLS
+// overloading intended to avoid TLS lookup of pool manager. Seemingly not really useful since most Split()
+// operations will have an existing buffer to base a Copy() from
EXPORT_C TInt RMBufChain::Split(TInt anOffset, RMBufChain& newChain, RMBufAllocator& /* aRMBufAllocator */)
{
- return RCommsBufChain::Split ( anOffset, newChain );
+ return RMBufChain::Split ( anOffset, newChain );
}
--- a/datacommsserver/esockserver/CoreProviders/src/coretiernotificationactivity.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/CoreProviders/src/coretiernotificationactivity.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -168,16 +168,16 @@
// set up a session with each collector
for (TInt sessionId=0 ; sessionId<aCollectors.Count() ; ++sessionId)
{
- CDataCollectorSession* newCollector = CDataCollectorSession::NewL(aCollectors[sessionId], *this, sessionId );
- CleanupStack::PushL(newCollector);
- iCollectorSessions.AppendL(newCollector);
- CleanupStack::Pop(newCollector);
-
- // now owned by the CDataCollectorSession in iCollectorSessions so don't want it to be in the cleanup path twice!
- aCollectors[sessionId] = 0;
+ MDataCollector* collector = aCollectors[sessionId];
+ aCollectors[sessionId] = NULL;
+ CleanupStack::PushL(collector);
+ CDataCollectorSession* newCollectorSession = CDataCollectorSession::NewL(collector, *this, sessionId);
+ CleanupStack::Pop(collector);
+ CleanupStack::PushL(newCollectorSession);
+ iCollectorSessions.AppendL(newCollectorSession);
+ CleanupStack::Pop(newCollectorSession);
}
-
// Must run session creation and start loops separately in case the initial data fetch is synchronous.
// Reasoning:
// when a full set of data for each collector is received, notification is only allowed if all
--- a/datacommsserver/esockserver/UpsCoreProviders/inc/upscpractivities.h Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/UpsCoreProviders/inc/upscpractivities.h Mon Oct 04 02:21:43 2010 +0300
@@ -49,7 +49,7 @@
const Messages::TNodeId& Client();
void SetFlags(TInt aFlags);
-// TInt Flags();
+ TInt Flags();
EXPORT_DECLARE_SMELEMENT_HEADER( TStoreControlClient, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, TContext )
IMPORT_C virtual void DoL();
--- a/datacommsserver/esockserver/UpsCoreProviders/src/upscpractivities.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/UpsCoreProviders/src/upscpractivities.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -92,12 +92,12 @@
{
iFlags = aFlags;
}
-/*
+
TInt CDeferredCtrlClientJoinActivity::Flags()
{
return iFlags;
}
-*/
+
EXPORT_DEFINE_SMELEMENT(CDeferredCtrlClientJoinActivity::TStoreControlClient, NetStateMachine::MStateTransition, CDeferredCtrlClientJoinActivity::TContext)
EXPORT_C void CDeferredCtrlClientJoinActivity::TStoreControlClient::DoL()
@@ -109,6 +109,7 @@
__ASSERT_DEBUG(act->Client() == TNodeId::NullId(), User::Panic(KSpecAssert_ESockUpsCoreProv, 2));
const TCFControlClient::TJoinRequest& msg = message_cast<TCFControlClient::TJoinRequest>(iContext.iMessage);
act->SetClient(msg.iNodeId);
+ act->SetFlags(msg.iClientType.Flags());
}
EXPORT_DEFINE_SMELEMENT(CDeferredCtrlClientJoinActivity::TAddControlClientAndSendJoinComplete, NetStateMachine::MStateTransition, CDeferredCtrlClientJoinActivity::TContext)
@@ -121,7 +122,7 @@
__ASSERT_DEBUG(act->Client() != TNodeId::NullId(), User::Panic(KSpecAssert_ESockUpsCoreProv, 3));
// Add control client
- iContext.Node().AddClientL(act->Client(), TCFClientType(TCFClientType::ECtrl));
+ iContext.Node().AddClientL(act->Client(), TCFClientType(TCFClientType::ECtrl, act->Flags()));
// Send TJoinComplete
RClientInterface::OpenPostMessageClose(iContext.NodeId(), act->Client(), TCFControlClient::TJoinComplete().CRef());
--- a/datacommsserver/esockserver/bwins/esocksvrU.DEF Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/bwins/esocksvrU.DEF Mon Oct 04 02:21:43 2010 +0300
@@ -1055,4 +1055,9 @@
?GetVDataTableStatic@TTierTypeIdFactoryQuery@ESock@@SAPBUSVDataTableEntry@Meta@@XZ @ 1054 NONAME ; struct Meta::SVDataTableEntry const * ESock::TTierTypeIdFactoryQuery::GetVDataTableStatic(void)
?AddClientL@CMMCommsProviderBase@ESock@@UAEPAVRNodeInterface@Messages@@ABVTNodeId@4@ABVTClientType@4@PAX@Z @ 1055 NONAME ; class Messages::RNodeInterface * ESock::CMMCommsProviderBase::AddClientL(class Messages::TNodeId const &, class Messages::TClientType const &, void *)
?ConstructL@ACFMMNodeBase@ESock@@IAEXH@Z @ 1056 NONAME ; void ESock::ACFMMNodeBase::ConstructL(int)
+ ?GetVTablePtr@TSendErrorRecoveryReq@CGoneDownActivity@PRActivities@@SAPAVMStateTransition@NetStateMachine@@AAVTDesC8@@PAX@Z @ 1057 NONAME ; class NetStateMachine::MStateTransition * PRActivities::CGoneDownActivity::TSendErrorRecoveryReq::GetVTablePtr(class TDesC8 &, void *)
+ ?GetVTablePtr@TCancelAndCloseZone0ClientExtIfaces@CoreNetStates@@SAPAVMStateTransition@NetStateMachine@@AAVTDesC8@@PAX@Z @ 1058 NONAME ; class NetStateMachine::MStateTransition * CoreNetStates::TCancelAndCloseZone0ClientExtIfaces::GetVTablePtr(class TDesC8 &, void *)
+ ?GetVTablePtr@TIgnoreOrPropagate@CGoneDownActivity@PRActivities@@SAPAVMStateFork@NetStateMachine@@AAVTDesC8@@PAX@Z @ 1059 NONAME ; class NetStateMachine::MStateFork * PRActivities::CGoneDownActivity::TIgnoreOrPropagate::GetVTablePtr(class TDesC8 &, void *)
+ ?DoL@TCancelStart@CoreNetStates@@UAEXXZ @ 1060 NONAME ; void CoreNetStates::TCancelStart::DoL(void)
+ ?New@CGoneDownActivity@PRActivities@@SAPAVCNodeActivityBase@MeshMachine@@ABUTNodeActivity@4@AAVAMMNodeBase@4@@Z @ 1061 NONAME ; class MeshMachine::CNodeActivityBase * PRActivities::CGoneDownActivity::New(struct MeshMachine::TNodeActivity const &, class MeshMachine::AMMNodeBase &)
--- a/datacommsserver/esockserver/commsdataobjects/src/connectionqueryset.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/commsdataobjects/src/connectionqueryset.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -37,7 +37,7 @@
EXPORT_START_ATTRIBUTE_TABLE_AND_FN(XConnectionQuerySet, CCommsDataObjectFactory::iUid, XConnectionQuerySet::iUid)
REGISTER_ATTRIBUTE(XConnectionQuerySet, iQueries, TMetaObject<XConnectionQuerySet::RMetaDataQueryContainer>)
-END_ATTRIBUTE_TABLE()
+END_ATTRIBUTE_TABLE_BASE(XCommsDataObject, 0)
EXPORT_C XConnectionQueryBase* XConnectionQuerySet::FindQuery(const XConnectionQueryBase& aQuery) const
--- a/datacommsserver/esockserver/commsdataobjects/src/provinfoqueryset.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/commsdataobjects/src/provinfoqueryset.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -26,7 +26,7 @@
EXPORT_START_ATTRIBUTE_TABLE_AND_FN(XProviderInfoQuerySet, CCommsDataObjectFactory::iUid, XProviderInfoQuerySet::iUid)
REGISTER_ATTRIBUTE(XProviderInfoQuerySet, iConnProviderInfo, TMeta<TConnProviderInfo>)
-END_ATTRIBUTE_TABLE()
+END_ATTRIBUTE_TABLE_BASE(XCommsDataObject, 0)
EXPORT_C XProviderInfoQuerySet::~XProviderInfoQuerySet()
--- a/datacommsserver/esockserver/core_states/ss_corepractivities.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/core_states/ss_corepractivities.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -1704,9 +1704,9 @@
{
__ASSERT_DEBUG(iPendingBinder, User::Panic(KSpecAssert_ESockCrStaCPRAC, 22));
- PostRequestTo(
- address_cast<Messages::TNodeId>(FirstOriginator().RecipientId()),
- TCFServiceProvider::TCommsBinderResponse(iPendingBinder->RecipientId()).CRef());
+ PostRequestTo(
+ SoleOriginator().Peer(),
+ TCFServiceProvider::TCommsBinderResponse(iPendingBinder->RecipientId()).CRef());
iPendingBinder->SetFlags(TCFClientType::EActivating);
}
@@ -2118,7 +2118,7 @@
//
//-=========================================================
-MeshMachine::CNodeActivityBase* CGoneDownActivity::New(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode)
+EXPORT_C MeshMachine::CNodeActivityBase* CGoneDownActivity::New(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode)
{
TAny* space = BorrowPreallocatedSpace(aNode, sizeof(CGoneDownActivity));
CGoneDownActivity* self = new (space) CGoneDownActivity(aActivitySig, aNode);
@@ -2180,7 +2180,7 @@
return NetStateMachine::ACore::IsIdle();
}
-DEFINE_SMELEMENT(CGoneDownActivity::TSendErrorRecoveryReq, NetStateMachine::MStateTransition, CGoneDownActivity::TContext)
+EXPORT_DEFINE_SMELEMENT(CGoneDownActivity::TSendErrorRecoveryReq, NetStateMachine::MStateTransition, CGoneDownActivity::TContext)
void CGoneDownActivity::TSendErrorRecoveryReq::DoL()
{
__ASSERT_DEBUG(iContext.iNodeActivity, User::Panic(KCorePrPanic, KPanicNoActivity));
@@ -2203,7 +2203,7 @@
activity.ClearPostedTo();
}
-DEFINE_SMELEMENT(CGoneDownActivity::TIgnoreOrPropagate, NetStateMachine::MStateFork, CGoneDownActivity::TContext)
+EXPORT_DEFINE_SMELEMENT(CGoneDownActivity::TIgnoreOrPropagate, NetStateMachine::MStateFork, CGoneDownActivity::TContext)
TInt CGoneDownActivity::TIgnoreOrPropagate::TransitionTag()
{
__ASSERT_DEBUG(iContext.iMessage.IsMessage<TEErrorRecovery::TErrorRecoveryResponse>(), User::Panic(KSpecAssert_ESockCrStaCPRAC, 38));
--- a/datacommsserver/esockserver/core_states/ss_corepractivities.h Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/core_states/ss_corepractivities.h Mon Oct 04 02:21:43 2010 +0300
@@ -891,7 +891,7 @@
class CGoneDownActivity : public MeshMachine::CNodeRetryActivity, protected MeshMachine::APreallocatedOriginators<2>
{
public:
- static MeshMachine::CNodeActivityBase* New(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
+ IMPORT_C static MeshMachine::CNodeActivityBase* New(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
protected:
CGoneDownActivity(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
@@ -913,11 +913,11 @@
typedef MeshMachine::TNodeContext<ESock::CMMCommsProviderBase, CoreNetStates::TContext> TContext;
public:
- DECLARE_SMELEMENT_HEADER( TIgnoreOrPropagate, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, TContext )
+ EXPORT_DECLARE_SMELEMENT_HEADER( TIgnoreOrPropagate, MeshMachine::TStateFork<TContext>, NetStateMachine::MStateFork, TContext )
virtual TInt TransitionTag();
DECLARE_SMELEMENT_FOOTER( TIgnoreOrPropagate )
- DECLARE_SMELEMENT_HEADER( TSendErrorRecoveryReq, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, TContext )
+ EXPORT_DECLARE_SMELEMENT_HEADER( TSendErrorRecoveryReq, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, TContext )
virtual void DoL();
DECLARE_SMELEMENT_FOOTER( TSendErrorRecoveryReq )
};
--- a/datacommsserver/esockserver/core_states/ss_coreprstates.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/core_states/ss_coreprstates.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -232,8 +232,8 @@
// which is handled by another activity
__ASSERT_DEBUG(msg.iClientType.Type() != (TUint32)TCFClientType::EData, User::Panic(KSpecAssert_ESockCrStaCPRSC, 3));
-// iContext.Node().AddClientL(msg.iNodeId, TClientType(TCFClientType::ECtrl,msg.iValue));
- iContext.Node().AddClientL(msg.iNodeId, TClientType(TCFClientType::ECtrl));
+ iContext.Node().AddClientL(msg.iNodeId, TClientType(TCFClientType::ECtrl,msg.iClientType.Flags()));
+
//Send confirmation
RClientInterface::OpenPostMessageClose(iContext.NodeId(), iContext.iSender, TCFPeer::TJoinComplete().CRef());
}
@@ -764,7 +764,7 @@
//TODO: TNodePeerId should become internal. When this happens, FirstOriginator should return
// RNodeInterface.
iContext.iNodeActivity->PostRequestTo(
- address_cast<Messages::TNodeId>(iContext.iNodeActivity->SoleOriginator().RecipientId()),
+ iContext.iNodeActivity->SoleOriginator().Peer(),
TCFDataClient::TBindTo(binderResponse.iNodeId).CRef());
}
@@ -2127,7 +2127,7 @@
iContext.iNodeActivity->SetError(static_cast<TSigNumber&>(iContext.iMessage).iValue);
}
-DEFINE_SMELEMENT(TCancelAndCloseZone0ClientExtIfaces, NetStateMachine::MStateTransition, CoreNetStates::TContext)
+EXPORT_DEFINE_SMELEMENT(TCancelAndCloseZone0ClientExtIfaces, NetStateMachine::MStateTransition, CoreNetStates::TContext)
void TCancelAndCloseZone0ClientExtIfaces::DoL()
{
//0 means we will cancel and close all open extensions!
@@ -2182,7 +2182,7 @@
}
EXPORT_DEFINE_SMELEMENT(TCancelStart, NetStateMachine::MStateTransition, CoreNetStates::TContext)
-void TCancelStart::DoL()
+EXPORT_C void TCancelStart::DoL()
{
CNodeActivityBase* startActivity = iContext.Node().FindActivityById(ECFActivityStart);
if (startActivity)
--- a/datacommsserver/esockserver/core_states/ss_coreprstates.h Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/core_states/ss_coreprstates.h Mon Oct 04 02:21:43 2010 +0300
@@ -11,7 +11,7 @@
// Contributors:
//
// Description:
-// Core PR States
+// Core PR State
//
//
@@ -759,19 +759,19 @@
IMPORT_C virtual void DoL();
DECLARE_SMELEMENT_FOOTER( TCancelDataClientStart )
-DECLARE_SMELEMENT_HEADER( TCancelAndCloseZone0ClientExtIfaces, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, TContext )
+EXPORT_DECLARE_SMELEMENT_HEADER( TCancelAndCloseZone0ClientExtIfaces, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, TContext )
virtual void DoL();
DECLARE_SMELEMENT_FOOTER( TCancelAndCloseZone0ClientExtIfaces )
EXPORT_DECLARE_SMELEMENT_HEADER( TProcessOrForwardRMessage2Ext, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, TContext )
- virtual void DoL();
+ IMPORT_C virtual void DoL();
DECLARE_SMELEMENT_FOOTER( TProcessOrForwardRMessage2Ext )
/**
* Check if ECFActivityStart is running, and if so cancel it
*/
EXPORT_DECLARE_SMELEMENT_HEADER( TCancelStart, MeshMachine::TStateTransition<TContext>, NetStateMachine::MStateTransition, TContext )
- virtual void DoL();
+ IMPORT_C virtual void DoL();
DECLARE_SMELEMENT_FOOTER( TCancelStart )
DECLARE_AGGREGATED_TRANSITION2(
--- a/datacommsserver/esockserver/eabi/esocksvrU.DEF Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/eabi/esocksvrU.DEF Mon Oct 04 02:21:43 2010 +0300
@@ -1962,4 +1962,15 @@
_ZN5ESock20CMMCommsProviderBase10AddClientLERKN8Messages7TNodeIdERKNS1_11TClientTypeEPv @ 1961 NONAME
_ZThn36_N5ESock20CMMCommsProviderBase10AddClientLERKN8Messages7TNodeIdERKNS1_11TClientTypeEPv @ 1962 NONAME
_ZN5ESock13ACFMMNodeBase10ConstructLEi @ 1963 NONAME
+ _ZN12PRActivities17CGoneDownActivity18TIgnoreOrPropagate12GetVTablePtrER6TDesC8Pv @ 1964 NONAME
+ _ZN12PRActivities17CGoneDownActivity21TSendErrorRecoveryReq12GetVTablePtrER6TDesC8Pv @ 1965 NONAME
+ _ZN12PRActivities17CGoneDownActivity3NewERKN11MeshMachine13TNodeActivityERNS1_11AMMNodeBaseE @ 1966 NONAME
+ _ZN13CoreNetStates12TCancelStart3DoLEv @ 1967 NONAME
+ _ZN13CoreNetStates35TCancelAndCloseZone0ClientExtIfaces12GetVTablePtrER6TDesC8Pv @ 1968 NONAME
+ _ZTIN12PRActivities17CGoneDownActivity18TIgnoreOrPropagateE @ 1969 NONAME
+ _ZTIN12PRActivities17CGoneDownActivity21TSendErrorRecoveryReqE @ 1970 NONAME
+ _ZTIN13CoreNetStates35TCancelAndCloseZone0ClientExtIfacesE @ 1971 NONAME
+ _ZTVN12PRActivities17CGoneDownActivity18TIgnoreOrPropagateE @ 1972 NONAME
+ _ZTVN12PRActivities17CGoneDownActivity21TSendErrorRecoveryReqE @ 1973 NONAME
+ _ZTVN13CoreNetStates35TCancelAndCloseZone0ClientExtIfacesE @ 1974 NONAME
--- a/datacommsserver/esockserver/inc/SS_conn.H Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/inc/SS_conn.H Mon Oct 04 02:21:43 2010 +0300
@@ -40,7 +40,6 @@
class TProcessIncomingConnection;
class TProcessProgressRequest;
class TParseECNAttach;
- class TJoinReceivedCpr;
class TProcessBinderResponseForCpr;
class TCompleteLegacyAttach;
class TProcessEnumResponse;
@@ -144,7 +143,6 @@
friend class ConnStates::TProcessIncomingConnection;
friend class ConnStates::TProcessProgressRequest;
friend class ConnStates::TParseECNAttach;
- friend class ConnStates::TJoinReceivedCpr;
friend class ConnStates::TProcessBinderResponseForCpr;
friend class ConnStates::TCompleteLegacyAttach;
friend class ConnStates::TProcessEnumResponse;
@@ -155,6 +153,7 @@
friend class EnumerateConnectionsActivity::TCompleteClient;
friend class AllInterfaceNotificationActivity::TEnqueueNotification;
friend class AllInterfaceNotificationActivity::TSendErrorToConnection;
+ friend class ConnActivities::CAllInterfaceNotificationActivity;
friend class ConnSubConnEventsActivity::TProcessSubConnEvent;
friend class ConnStates::TGenerateConnectionUpProgress;
@@ -294,6 +293,7 @@
friend class AllInterfaceNotificationActivity::TStartLinkNotification;
friend class AllInterfaceNotificationActivity::TEnqueueNotification;
friend class AllInterfaceNotificationActivity::TSendErrorToConnection;
+friend class ConnActivities::CAllInterfaceNotificationActivity;
public:
CAllInterfaceNotificationWorker(ESock::CConnection& aConnection);
--- a/datacommsserver/esockserver/inc/es_commsdataobject.h Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/inc/es_commsdataobject.h Mon Oct 04 02:21:43 2010 +0300
@@ -112,7 +112,14 @@
EOperationSet = 0,
/** Client requested that the object retreive data from a provider */
- EOperationGet = 1
+ EOperationGet = 1,
+
+ /**
+ Default value for uninitialized requests.
+ This is only used as a sanity checking measure where the implementation of a
+ CommsDataObject has failed to explicitly specify the client requested operation, i.e. get or set
+ */
+ EOperationUninitialized = 0xFFFFFFFF
};
@@ -160,7 +167,7 @@
@see MAccessPointConfigApi
*/
XCommsDataObject(TUint aFlags)
- : iReqItfExtId((TUint)EAccessPointConfigApi), iFlags(aFlags)
+ : iOperationMode(EOperationUninitialized), iReqItfExtId((TUint)EAccessPointConfigApi), iFlags(aFlags)
{
__ASSERT_DEBUG((aFlags & ~EAllFlags) == 0, User::Panic(KSpecAssert_ESocks_cmsdtbjct, 1));
__ASSERT_DEBUG((aFlags & EOperationSupportMask) != 0, User::Panic(KSpecAssert_ESocks_cmsdtbjct, 2));
@@ -178,7 +185,7 @@
@param aReqItfExtId An interface identifier from TSupportedCommsApiExt.
*/
XCommsDataObject(TUint aFlags, TUint aReqItfExtId)
- : iReqItfExtId(aReqItfExtId), iFlags(aFlags)
+ : iOperationMode(EOperationUninitialized), iReqItfExtId(aReqItfExtId), iFlags(aFlags)
{
__ASSERT_DEBUG((aFlags & ~EAllFlags) == 0, User::Panic(KSpecAssert_ESocks_cmsdtbjct, 3));
__ASSERT_DEBUG((aFlags & EOperationSupportMask) != 0, User::Panic(KSpecAssert_ESocks_cmsdtbjct, 4));
--- a/datacommsserver/esockserver/inc/es_enum_internal.h Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/inc/es_enum_internal.h Mon Oct 04 02:21:43 2010 +0300
@@ -88,6 +88,15 @@
*/
typedef TPckgBuf<TConnectionGetSocketInfoArg> TConnGetSocketInfoArgBuf;
+/**
+This enum is used as an internal extension to TConnInterfaceState
+
+@internalComponent
+*/
+enum TConnInterfaceStateInternal
+ {
+ EInterfaceRestarting = 0x100
+ };
#include <es_enum_internal.inl>
--- a/datacommsserver/esockserver/inc/ss_connLegacy.h Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/inc/ss_connLegacy.h Mon Oct 04 02:21:43 2010 +0300
@@ -49,6 +49,11 @@
class TSendErrorToConnection;
}
+namespace ConnActivities
+{
+class CAllInterfaceNotificationActivity;
+}
+
namespace EnumerateConnectionsActivity
{
class TQueryTierStatus;
@@ -84,9 +89,12 @@
friend class EnumerateConnectionsActivity::TCompleteClient;
friend class AllInterfaceNotificationActivity::TEnqueueNotification;
friend class AllInterfaceNotificationActivity::TSendErrorToConnection;
+ friend class ConnActivities::CAllInterfaceNotificationActivity;
friend class ConnStates::TNoTagOrCancelAllInterfaceWorker;
friend class ConnStates::TCancelAllInterfaceNotificationWorker;
+public:
+ enum { KIPProtoConnectionProviderFactoryUid = 0x10281DD3 };
public: //So that friends of CConnection (transitions) can access it
void CompleteAttachL(TSelectionPrefs& aPrefs);
void CancelServiceChangeNotification(const Den::RSafeMessage& aMessage);
@@ -155,7 +163,6 @@
ADataMonitoringProvider* FetchSubConnDataMonitoringProvider() const;
//global notifications
- void InterfaceStateChangeNotification(TDesC8& aInfo);
void RequestServiceChangeNotificationL(const Den::RSafeMessage& aMessage);
void ControlL(TUint aOptionName, TUint aMessageId);
@@ -212,9 +219,6 @@
RMessage2 iAllInterfaceNotificationMessage;
TInterfaceChangeQueue iNotificationQueue;
Messages::TNodeId iAllInterfaceNotificationWorker;
-
-protected:
- static const TAnyFn iInterfaceVTableF[];
};
--- a/datacommsserver/esockserver/inc/ss_connstates.h Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/inc/ss_connstates.h Mon Oct 04 02:21:43 2010 +0300
@@ -84,10 +84,6 @@
virtual void DoL();
DECLARE_SMELEMENT_FOOTER( TSelectMetaPlane )
-DECLARE_SMELEMENT_HEADER( TJoinReceivedCpr, SubSessStates::TECABStateTransitionBase<TContext>, NetStateMachine::MStateTransition, TContext )
- virtual void DoL();
-DECLARE_SMELEMENT_FOOTER( TJoinReceivedCpr )
-
DECLARE_SMELEMENT_HEADER( TSendFinishedSelectionStateChange, SubSessStates::TECABStateTransitionBase<TContext>, NetStateMachine::MStateTransition, TContext )
virtual void DoL();
DECLARE_SMELEMENT_FOOTER( TSendFinishedSelectionStateChange )
@@ -118,12 +114,6 @@
virtual void DoL();
DECLARE_SMELEMENT_FOOTER( TStartConnection )
-DECLARE_AGGREGATED_TRANSITION2(
- TSendFinishedSelectionAndJoinReceivedCpr,
- ConnStates::TSendFinishedSelectionStateChange,
- ConnStates::TJoinReceivedCpr
- )
-
DECLARE_SMELEMENT_HEADER( TErrorOrCancel, MeshMachine::TStateFork<ConnStates::TContext>, NetStateMachine::MStateFork, ConnStates::TContext )
virtual TInt TransitionTag();
DECLARE_SMELEMENT_FOOTER( TErrorOrCancel )
@@ -525,6 +515,8 @@
public:
static MeshMachine::CNodeActivityBase* NewL(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode);
+ void InterfaceStateChangeNotification(const TDesC8& aInfo);
+ ESock::CCommsFactoryBase* IpProtoCprFactory() const;
private:
CAllInterfaceNotificationActivity(const MeshMachine::TNodeActivity& aActivitySig, MeshMachine::AMMNodeBase& aNode) :
@@ -535,11 +527,16 @@
}
virtual ~CAllInterfaceNotificationActivity();
+ const Factories::TAnyFn& GetVTable() { return iInterfaceVTableF[0]; };
private:
TUid iTierUid;
Messages::TNodeId iTierManager;
const CAllInterfaceNotificationWorker* iAllInterfaceNotificationWorker;
+ TBool iRegisteredForInterfaceStateChanges:1; // Registered with IpProtoCpr factory
+
+private:
+ static const ESock::TAnyFn iInterfaceVTableF[];
};
/**
--- a/datacommsserver/esockserver/inc/ss_sapshim.h Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/inc/ss_sapshim.h Mon Oct 04 02:21:43 2010 +0300
@@ -230,6 +230,8 @@
SAP_FLAG_FUNCTIONS(DeleteUponBearerReception, EDeleteUponBearerReception)
SAP_FLAG_FUNCTIONS(UseBearerErrors, EUseBearerErrors)
+ void HostResolverSpecificUnbind();
+
private:
CServProviderBase* iProvider;
//CHostResolver specific workaround for now
--- a/datacommsserver/esockserver/ssock/ss_connLegacy.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/ssock/ss_connLegacy.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -62,12 +62,6 @@
//const TInt KNumberOfEmulatedSubConnections = 2;
-const Factories::TAnyFn AConnectionLegacy::iInterfaceVTableF[] =
- {
- (Factories::TAnyFn)1,
- (Factories::TAnyFn)(TFactoryNotify<AConnectionLegacy>::Notification)
- };
-
AConnectionLegacy::~AConnectionLegacy()
{
TSubConnectionEvent* subConnectionEvent;
@@ -130,7 +124,7 @@
}
-static const TUid K_CIPProtoConnectionProviderFactory_iUid = {0x10281DD3};
+//static const TUid K_CIPProtoConnectionProviderFactory_iUid = {0x10281DD3};
void AConnectionLegacy::CompleteAttachL(ESock::TSelectionPrefs& aPrefs)
{
@@ -146,7 +140,7 @@
__ASSERT_DEBUG(cpr->GetFirstClient<TDefaultClientMatchPolicy>(TClientType(TCFClientType::EServProvider))==NULL, User::Panic(KSpecAssert_ESockSSockscnLgc, 3)); //This is why we are "legacy"
CConnectionFactoryContainer& container = *static_cast<CPlayer&>(iConnection.Player()).SockManGlobals()->iConnectionFactories;
- CCommsFactoryBase* factory = static_cast<CCommsFactoryBase*>(container.FindFactory(K_CIPProtoConnectionProviderFactory_iUid));
+ CCommsFactoryBase* factory = static_cast<CCommsFactoryBase*>(container.FindFactory(TUid::Uid(KIPProtoConnectionProviderFactoryUid)));
User::LeaveIfError(factory? KErrNone : KErrArgument);
XConnectionFactoryAPQuery query(static_cast<const TCommDbConnPref&>(cp).IapId());
@@ -900,40 +894,6 @@
iConnection.DontCompleteCurrentRequest();
}
-
-
-void AConnectionLegacy::InterfaceStateChangeNotification(TDesC8& /*aInfo*/)
- {
- //[399TODO] implement InterfaceStateChangeNotification
- LOG(ESockLog::Printf(KESockConnectionTag, _L8("TODO: implement InterfaceStateChangeNotification - KErrNotSupported")));
-#if TODO_IMPLEMENT_THIS
- TInterfaceNotification& interfaceNotification = ((TInterfaceNotificationBuf&)aInfo)();
-
- if(iAllInterfaceNotificationMessage.IsNull())
- {
- iInterfaceChangeQueue.Enque(interfaceNotification);
- return;
- }
- else // request is outstanding
- {
- if(!iInterfaceChangeQueue.IsEmpty())
- {
- // can this situation ever happen?
- // - new requests fullfilled from queue before becoming outstanding
- // - no queued items when request outstanding
-
- // But in case we do...
- // should we get oldest change first in case this new one overwrites it
- iInterfaceChangeQueue.Enque(interfaceNotification);
- iInterfaceChangeQueue.Deque(interfaceNotification);
- }
-
- TInt ret = iAllInterfaceNotificationMessage.Write(0, aInfo);
- CompleteMessage(iAllInterfaceNotificationMessage, ret);
- }
-#endif
- }
-
void AConnectionLegacy::SubConnectionEvent(const TSubConnectionEvent& aSubConnectionEvent)
{
// Pass the message onto the client if possible, or buffer if necessary
--- a/datacommsserver/esockserver/ssock/ss_connstates.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/ssock/ss_connstates.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -56,7 +56,7 @@
#include <comms-infras/ss_upsaccesspointconfigext.h>
#include <comms-infras/upsmessages.h>
#endif
-
+#include <comms-infras/ss_roles.h>
#ifdef _DEBUG
// Panic category for "absolutely impossible!" vanilla ASSERT()-type panics from this module
// (if it could happen through user error then you should give it an explicit, documented, category + code)
@@ -252,35 +252,6 @@
TCFMessage::TStateChange(TStateChange(KFinishedSelection,KErrNone)).CRef());
}
-DEFINE_SMELEMENT(ConnStates::TJoinReceivedCpr, NetStateMachine::MStateTransition, ConnStates::TContext)
-void ConnStates::TJoinReceivedCpr::DoL()
- {
- __ASSERT_DEBUG(iContext.iNodeActivity, ConnPanic(KPanicNoActivity));
- __ASSERT_DEBUG(iContext.Node().ServiceProvider()==NULL, ConnPanic(KPanicExpectedNoServiceProvider));
-
- TCFDataClient::TBindTo& bt = message_cast<TCFDataClient::TBindTo>(iContext.iMessage);
- RNodeInterface* newSP = iContext.Node().AddClientL(bt.iNodeId, TClientType(TCFClientType::EServProvider, TCFClientType::EActive));
- __ASSERT_DEBUG(iContext.Node().ServiceProvider()==newSP, ConnPanic(KPanicNoServiceProvider)); //[RZ] revise this, possibly overdefensive
-
- //If this is attach, we need to see if we are a monitor or not
- TClientType clientType(TCFClientType::ECtrl);
-
- TUint selPrefs = static_cast<ConnActivities::CStartAttachActivity&>(*iContext.iNodeActivity).SelectionPrefs().Flags();
- if (selPrefs & TSelectionPrefs::EMonitor)
- {
- clientType.SetFlags(TCFClientType::EMonitor);
- iContext.Node().iIsMonitor = ETrue;
- }
-
- // If it is an attach set the flag cause it is used by NetUPS to check if a JoinRequest comes from an RConnection::Attach
- if (selPrefs & TSelectionPrefs::EAttach)
- {
- clientType.SetFlags(TCFClientType::EAttach);
- }
- iContext.iNodeActivity->PostRequestTo(*newSP,
- TCFServiceProvider::TJoinRequest(iContext.NodeId(), clientType).CRef());
- }
-
DEFINE_SMELEMENT(ConnStates::TJoinReceivedSCpr, NetStateMachine::MStateTransition, ConnStates::TContext)
void ConnStates::TJoinReceivedSCpr::DoL()
{
@@ -470,9 +441,11 @@
__ASSERT_DEBUG(iContext.iNodeActivity, ConnPanic(KPanicNoActivity));
CSubConnection* waitingSubConn = iContext.Node().Session()->CSubConnectionFromHandle(static_cast<CESockClientActivityBase&>(*iContext.iNodeActivity).Int0());
User::LeaveIfError(waitingSubConn != NULL ? KErrNone : KErrCancel);
-
+ RNodeInterface* waitingSubConnPeer = iContext.Node().FindClient(waitingSubConn->Id()); //To my surprise SC is a peer of this (so must use peer handle when talking to it)
+ __ASSERT_DEBUG(waitingSubConnPeer, ConnPanic(KPanicNoDataClient));
+
TCFServiceProvider::TCommsBinderResponse& binderResp = message_cast<TCFServiceProvider::TCommsBinderResponse>(iContext.iMessage);
- iContext.iNodeActivity->PostRequestTo(waitingSubConn->Id(),
+ iContext.iNodeActivity->PostRequestTo(*waitingSubConnPeer,
TCFDataClient::TBindTo(binderResp.iNodeId).CRef());
}
@@ -1301,9 +1274,61 @@
{
iNode.RemoveClient(aux->RecipientId());
}
+
+ if (iRegisteredForInterfaceStateChanges)
+ {
+ CCommsFactoryBase* ipProtoCprFactory = IpProtoCprFactory();
+ if (ipProtoCprFactory)
+ {
+ Factories::IFactoryNotify itf(this, GetVTable());
+ ipProtoCprFactory->DeRegisterNotifier(itf);
+ }
+ }
+
delete iAllInterfaceNotificationWorker; //delete this node (why via iAllInterfaceNotificationWorker??)
}
+/**
+Called by the IpProtoCpr factory to propagate an interface state change from IpProtoCpr to registered
+observers (suc as ourself). If the interface is restarting, then we need to insert an EInterfaceDown,
+EInterfaceUp "toggle" sequence into the AllInterfaceNotification queue. This is because, ordinarily,
+EInterfaceUp and EInterfaceDown are generated when the IpProtoCpr itself is created and destroyed,
+but not if it is restarted before being destroyed.
+*/
+void CAllInterfaceNotificationActivity::InterfaceStateChangeNotification(const TDesC8& aInfo)
+ {
+ if (aInfo.Length() == sizeof(TInterfaceNotification))
+ {
+ const TInterfaceNotification* const info = reinterpret_cast<const TInterfaceNotification*>(aInfo.Ptr());
+ if (info && info->iState == EInterfaceRestarting)
+ {
+ LOG( ESockLog::Printf(KESockConnectionTag, _L("CAllInterfaceNotificationActivity %08x:\tInterfaceStateChangeNotification(): CConnection %08x, IapId %d, NetId %d"),
+ this, &iAllInterfaceNotificationWorker->iConnection, info->iConnectionInfo.iIapId, info->iConnectionInfo.iNetId ));
+
+ AConnectionLegacy& legacy = iAllInterfaceNotificationWorker->iConnection.iLegacyConnection;
+ TInterfaceNotification notification(*info);
+ notification.iState = EInterfaceDown;
+ legacy.iNotificationQueue.Enque(notification);
+ notification.iState = EInterfaceUp;
+ legacy.iNotificationQueue.Enque(notification);
+ legacy.CompleteAllInterfaceNotificationL(KErrNone);
+ }
+ }
+ }
+
+CCommsFactoryBase* CAllInterfaceNotificationActivity::IpProtoCprFactory() const
+ {
+ CConnectionFactoryContainer& container = *static_cast<CPlayer&>(iAllInterfaceNotificationWorker->iConnection.Player()).SockManGlobals()->iConnectionFactories;
+ return static_cast<CCommsFactoryBase*>(container.FindFactory(TUid::Uid(AConnectionLegacy::KIPProtoConnectionProviderFactoryUid)));
+ }
+
+// Registration table for receiving InterfaceStateChangeNotification() events.
+const Factories::TAnyFn CAllInterfaceNotificationActivity::iInterfaceVTableF[] =
+ {
+ (Factories::TAnyFn)1, // number of methods. the following entries must be in this order!
+ (Factories::TAnyFn)(Factories::TFactoryNotify<CAllInterfaceNotificationActivity>::Notification)
+ };
+
// States
DEFINE_SMELEMENT(AllInterfaceNotificationActivity::TAwaitingStart, NetStateMachine::MState, TContext)
@@ -1459,6 +1484,23 @@
TCFTierStatusProvider::TTierNotification& msg = message_cast<TCFTierStatusProvider::TTierNotification>(iContext.iMessage);
__ASSERT_DEBUG(msg.iBundle, User::Panic(KSpecAssert_ESockSSockscnsts, 14));
+
+ CAllInterfaceNotificationActivity& act = *iContext.Activity();
+
+ // Register with the IpProtoCpr factory for interface state changes if we haven't already done so.
+ // We can only do this if the IpProtoCpr is active, and the assumption here is that it must be active
+ // if an interface event has been generated.
+ if (!act.iRegisteredForInterfaceStateChanges)
+ {
+ CCommsFactoryBase* ipProtoCprFactory = act.IpProtoCprFactory();
+ if (ipProtoCprFactory)
+ {
+ Factories::IFactoryNotify itf(&act, act.GetVTable());
+ ipProtoCprFactory->RegisterNotifierL(itf);
+ act.iRegisteredForInterfaceStateChanges = ETrue;
+ }
+ }
+
if(msg.iBundle->PtrL()->CountParamSetContainers() > 0)
{
TInt i = 0;
--- a/datacommsserver/esockserver/ssock/ss_flowrequeststates.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/ssock/ss_flowrequeststates.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -96,8 +96,8 @@
TCFServiceProvider::TCommsBinderResponse& br = message_cast<TCFServiceProvider::TCommsBinderResponse>(iContext.iMessage);
- iContext.Node().AddClientL(br.iNodeId, TClientType(TCFClientType::EServProvider, TCFClientType::EDefault));
- iContext.iNodeActivity->PostRequestTo(br.iNodeId, TCFServiceProvider::TJoinRequest(iContext.NodeId(),
+ RNodeInterface* brPeer = iContext.Node().AddClientL(br.iNodeId, TClientType(TCFClientType::EServProvider, TCFClientType::EDefault));
+ iContext.iNodeActivity->PostRequestTo(*brPeer, TCFServiceProvider::TJoinRequest(iContext.NodeId(),
TClientType(TCFClientType::ECtrl)).CRef());
}
--- a/datacommsserver/esockserver/ssock/ss_rmetaextensioncontainer.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/ssock/ss_rmetaextensioncontainer.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -67,15 +67,24 @@
EXPORT_C const Meta::SMetaData* RMetaExtensionContainerC::FindExtension(const Meta::STypeId& aTypeId) const
{
- __ASSERT_ALWAYS(iContainerImpl, PanicMec(ENoImplementation));
- return iContainerImpl->FindExtension(aTypeId);
+ if (Container())
+ {
+ return Container()->FindExtension(aTypeId);
+ }
+ else
+ {
+ return NULL;
+ }
}
EXPORT_C const Meta::SMetaData& RMetaExtensionContainerC::FindExtensionL(const Meta::STypeId& aTypeId) const
{
- __ASSERT_ALWAYS(iContainerImpl, PanicMec(ENoImplementation));
- return iContainerImpl->FindExtensionL(aTypeId);
+ if (!Container())
+ {
+ User::Leave(KErrNotFound);
+ }
+ return Container()->FindExtensionL(aTypeId);
}
--- a/datacommsserver/esockserver/ssock/ss_sapshim.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/ssock/ss_sapshim.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -268,6 +268,28 @@
return this;
}
+void CTransportFlowShim::HostResolverSpecificUnbind()
+ {
+ // Can't have both HR & SAP
+ __ASSERT_DEBUG(!iProvider, User::Panic(KSpecAssert_ESockSSocksspshm, 9));
+
+ if(iSubConnectionProvider.IsOpen())
+ {
+ iSessionControlNotify = NULL;
+ iSessionDataNotify = NULL;
+ iHostResolverNotify = NULL;
+ if (!Idle())
+ {
+ SetIdle();
+ ProcessDCIdleState();
+ }
+ }
+ else
+ {
+ DeleteThisFlow();
+ }
+ }
+
void CTransportFlowShim::Unbind()
{
LOG( ESockLog::Printf(_L8("CTransportFlowShim %08x:\tUnbind()"), this) );
@@ -279,41 +301,30 @@
return;
}
- // Legacy support for host resolvers
+ // Legacy support for host resolvers involves a separate north bound MUpperControl interface
if(iHostResolverNotify)
{
- __ASSERT_DEBUG(!iProvider, User::Panic(KSpecAssert_ESockSSocksspshm, 9)); // can't have both HR & SAP
-
- LOG( ESockLog::Printf(_L8("CTransportFlowShim %08x:\tUnbind(): iBearerExpected %d"), this, BearerExpected()) );
- if (!BearerExpected())
+ HostResolverSpecificUnbind();
+ }
+ else
+ {
+ if (iProvider)
{
- delete this;
- }
- else
- {
- SetDeleteUponBearerReception();
- iHostResolverNotify = NULL;
+ iProvider->SetNotify(NULL);
+
+ if (!Detaching())
+ {
+ delete iProvider;
+ iProvider = NULL;
+ }
}
- return;
- }
-
- if (iProvider)
- {
- iProvider->SetNotify(NULL);
-
- if (!Detaching())
- {
- delete iProvider;
- iProvider = NULL;
- }
- }
#ifdef SYMBIAN_NETWORKING_UPS
- // Hook for derived classes to do cleanup before unbind occurs
- PreUnbind();
+ // Hook for derived classes to do cleanup before unbind occurs
+ PreUnbind();
#endif
-
- CNetworkFlow::Unbind();
+ CNetworkFlow::Unbind();
+ }
}
ESock::CSubConnectionFlowBase& CTransportFlowShim::CloneFlowL()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/datacommsserver/esockserver/test/TE_DummyProvider/configs/te_dummyprovider_011.ini Mon Oct 04 02:21:43 2010 +0300
@@ -0,0 +1,29 @@
+[CreateSockSvr1]
+SocketServName=SockSvr1
+
+[CreateConn1]
+ConnName=Conn1
+
+[ConnectSockSvr1]
+SocketServName=SockSvr1
+
+[OpenConn1]
+ConnName=Conn1
+SocketServName=SockSvr1
+ConnType=271069227
+
+[StartConn1]
+ConnName=Conn1
+SocketServName=SockSvr1
+SNAP=10
+ConnType=271069227
+
+[StopConn1]
+ConnName=Conn1
+ConnStopType=EStopNormal
+
+[CloseConn1]
+ConnName=Conn1
+
+[CloseSockSvr1]
+SocketServName=SockSvr1
\ No newline at end of file
--- a/datacommsserver/esockserver/test/TE_DummyProvider/group/TE_DummyProvider.iby Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_DummyProvider/group/TE_DummyProvider.iby Mon Oct 04 02:21:43 2010 +0300
@@ -28,8 +28,9 @@
data=EPOCROOT##epoc32\data\z\TestData\scripts\te_dummyprovider_005.script TestData\scripts\te_dummyprovider_005.script
data=EPOCROOT##epoc32\data\z\TestData\scripts\te_dummyprovider_006.script TestData\scripts\te_dummyprovider_006.script
data=EPOCROOT##epoc32\data\z\TestData\scripts\te_dummyprovider_008.script TestData\scripts\te_dummyprovider_008.script
-data=EPOCROOT##epoc32\data\z\TestData\scripts\te_dummyprovider_008.script TestData\scripts\te_dummyprovider_009.script
-data=EPOCROOT##epoc32\data\z\TestData\scripts\te_dummyprovider_008.script TestData\scripts\te_dummyprovider_010.script
+data=EPOCROOT##epoc32\data\z\TestData\scripts\te_dummyprovider_009.script TestData\scripts\te_dummyprovider_009.script
+data=EPOCROOT##epoc32\data\z\TestData\scripts\te_dummyprovider_010.script TestData\scripts\te_dummyprovider_010.script
+data=EPOCROOT##epoc32\data\z\TestData\scripts\te_dummyprovider_011.script TestData\scripts\te_dummyprovider_011.script
data=EPOCROOT##epoc32\data\z\TestData\scripts\te_dummyprovider_incomingSCPR.script TestData\scripts\te_dummyprovider_incomingSCPR.script
data=EPOCROOT##epoc32\data\z\TestData\configs\te_dummyproviders.cfg TestData\configs\te_dummyproviders.cfg
@@ -40,7 +41,11 @@
data=EPOCROOT##epoc32\data\z\TestData\configs\te_dummyprovider_005.ini TestData\configs\te_dummyprovider_005.ini
data=EPOCROOT##epoc32\data\z\TestData\configs\te_dummyprovider_006.ini TestData\configs\te_dummyprovider_006.ini
data=EPOCROOT##epoc32\data\z\TestData\configs\te_dummyprovider_008.ini TestData\configs\te_dummyprovider_008.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\te_dummyprovider_008.ini TestData\configs\te_dummyprovider_009.ini
-data=EPOCROOT##epoc32\data\z\TestData\configs\te_dummyprovider_008.ini TestData\configs\te_dummyprovider_010.ini
+data=EPOCROOT##epoc32\data\z\TestData\configs\te_dummyprovider_009.ini TestData\configs\te_dummyprovider_009.ini
+data=EPOCROOT##epoc32\data\z\TestData\configs\te_dummyprovider_010.ini TestData\configs\te_dummyprovider_010.ini
+data=EPOCROOT##epoc32\data\z\TestData\configs\te_dummyprovider_011.ini TestData\configs\te_dummyprovider_011.ini
+data=EPOCROOT##epoc32\data\z\TestData\configs\TE_DummyProvider_ip.tcpip.esk TestData\configs\TE_DummyProvider_ip.tcpip.esk
+
+
#endif // __TE_DummyProviders_IBY__
--- a/datacommsserver/esockserver/test/TE_DummyProvider/group/bld.inf Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_DummyProvider/group/bld.inf Mon Oct 04 02:21:43 2010 +0300
@@ -31,6 +31,7 @@
../scripts/te_dummyprovider_008.script z:/testdata/scripts/te_dummyprovider_008.script
../scripts/te_dummyprovider_009.script z:/testdata/scripts/te_dummyprovider_009.script
../scripts/te_dummyprovider_010.script z:/testdata/scripts/te_dummyprovider_010.script
+../scripts/te_dummyprovider_011.script z:/testdata/scripts/te_dummyprovider_011.script
../scripts/te_dummyprovider_incomingSCPR.script z:/testdata/scripts/te_dummyprovider_incomingscpr.script
@@ -44,4 +45,5 @@
../configs/te_dummyprovider_008.ini z:/testdata/configs/te_dummyprovider_008.ini
../configs/te_dummyprovider_009.ini z:/testdata/configs/te_dummyprovider_009.ini
../configs/te_dummyprovider_010.ini z:/testdata/configs/te_dummyprovider_010.ini
+../configs/te_dummyprovider_011.ini z:/testdata/configs/te_dummyprovider_011.ini
../configs/TE_DummyProvider_ip.tcpip.esk z:/testdata/configs/TE_DummyProvider_ip.tcpip.esk
--- a/datacommsserver/esockserver/test/TE_DummyProvider/scripts/te_dummyprovider.script Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_DummyProvider/scripts/te_dummyprovider.script Mon Oct 04 02:21:43 2010 +0300
@@ -35,6 +35,7 @@
RUN_SCRIPT z:\testdata\scripts\te_dummyprovider_008.script
RUN_SCRIPT z:\testdata\scripts\te_dummyprovider_009.script
RUN_SCRIPT z:\testdata\scripts\te_dummyprovider_010.script
+RUN_SCRIPT z:\testdata\scripts\te_dummyprovider_011.script
RUN_SCRIPT z:\testdata\scripts\te_esock_test_unloadesockForced.script
--- a/datacommsserver/esockserver/test/TE_DummyProvider/scripts/te_dummyprovider_004.script Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_DummyProvider/scripts/te_dummyprovider_004.script Mon Oct 04 02:21:43 2010 +0300
@@ -26,7 +26,16 @@
RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
START_TESTCASE COMINF-ESOCK-DummyProviders-004
-//! @SYMTestCaseID COMINF-ESOCK-DummyProviders-004
+//! @SYMTestCaseID COMINF-ESOCK-DummyProviders-004
+//! @SYMTestCaseDesc Tests the TCFServiceProvider::TStart/TStop semantics on the managemnet plane.
+//! @SYMTestActions Gets the MCPR to stop the control and data planes, whilst keeping itself alive.
+// Gets the MCPR to restart the control and data planes,
+// Uses RConnectionServ to monitor that connections are being stopped and started.
+// Gets the MCPR to stop the control and data planes and let itself be removed.
+//! @SYMTestExpectedResults Access points report started/stopped via RConnectionServ. No crashes.
+//! @SYMTestPriority Critical
+//! @SYMTestType CT
+//! @SYMComponent comms-infras_esock
RUN_TEST_STEP 100 te_esockteststepsSuite CreateRConnectionServStep z:\testdata\configs\te_dummyprovider_004.ini CreateConnectionServ1
RUN_TEST_STEP 100 te_esockteststepsSuite ConnectRConnectionServStep z:\testdata\configs\te_dummyprovider_004.ini ConnectConnectionServ1
@@ -67,4 +76,4 @@
RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
-PRINT Completed CASE003
+PRINT Completed CASE004
--- a/datacommsserver/esockserver/test/TE_DummyProvider/scripts/te_dummyprovider_009.script Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_DummyProvider/scripts/te_dummyprovider_009.script Mon Oct 04 02:21:43 2010 +0300
@@ -29,6 +29,8 @@
//! @SYMComponent comms-infras_esock
RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+RUN_UTILS MkDir c:\private\101f7989\
+RUN_UTILS MkDir c:\private\101f7989\ESock\
RUN_UTILS CopyFile c:\private\101f7989\ESock\ip.tcpip.esk c:\private\101f7989\ESock\ip.tcpip.esk.te_RSubConnectionCase70.archive
RUN_UTILS DeleteFile c:\private\101f7989\ESock\ip.tcpip.esk
RUN_UTILS CopyFile z:\testdata\configs\TE_DummyProvider_ip.tcpip.esk c:\private\101f7989\ESock\ip.tcpip.esk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/datacommsserver/esockserver/test/TE_DummyProvider/scripts/te_dummyprovider_011.script Mon Oct 04 02:21:43 2010 +0300
@@ -0,0 +1,48 @@
+//
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRINT Running CASE011
+PRINT Two dummy layers able to start successfully
+PRINT Execute the crazy start/wait/close loop increasing wait with every iteration.
+PRINT See how the stack manages cancelations at distinct stages.
+
+
+//
+LOAD_SUITE te_esockteststepsSuite -SharedData
+RUN_SCRIPT z:\TestData\scripts\te_esock_test_loadesock.script
+
+START_TESTCASE COMINF-ESOCK-DummyProviders-011
+//! @SYMTestCaseID COMINF-ESOCK-DummyProviders-011
+//! @SYMTestCaseDesc Tests the resiliance of the RConnection::Start to cancelations (induced by RConnection::Stop).
+//! @SYMTestActions Execute the crazy start/wait/close loop increasing wait with every iteration.
+//! @SYMTestExpectedResults No crashes, all operations complete (typically with KErrCancel, but that's not cared for)
+//! @SYMTestPriority Critical
+//! @SYMTestType CT
+//! @SYMComponent comms-infras_esock
+
+RUN_TEST_STEP 100 te_esockteststepsSuite creatersocketservStep z:\testdata\configs\te_dummyprovider_011.ini CreateSockSvr1
+RUN_TEST_STEP 100 te_esockteststepsSuite createrconnectionStep z:\testdata\configs\te_dummyprovider_011.ini CreateConn1
+RUN_TEST_STEP 100 te_esockteststepsSuite connectrsocketservStep z:\testdata\configs\te_dummyprovider_011.ini ConnectSockSvr1
+RUN_TEST_STEP 100 te_esockteststepsSuite openrconnectionStep z:\testdata\configs\te_dummyprovider_011.ini OpenConn1
+RUN_TEST_STEP 100 te_esockteststepsSuite StartCloseCrazyLoopRConnectionStep z:\testdata\configs\te_dummyprovider_011.ini StartConn1
+RUN_TEST_STEP 100 te_esockteststepsSuite closerconnectionStep z:\testdata\configs\te_dummyprovider_011.ini CloseConn1
+RUN_TEST_STEP 100 te_esockteststepsSuite closersocketservStep z:\testdata\configs\te_dummyprovider_011.ini CloseSockSvr1
+RUN_TEST_STEP 100 te_esockteststepsSuite cleanallStep
+END_TESTCASE COMINF-ESOCK-DummyProviders-011
+
+RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
+PRINT Completed CASE011
--- a/datacommsserver/esockserver/test/TE_EsockTestSteps/inc/Connections.TestSteps.h Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_EsockTestSteps/inc/Connections.TestSteps.h Mon Oct 04 02:21:43 2010 +0300
@@ -190,21 +190,73 @@
Note that since the test is normally executed by a thread of lower priority than ESock_IP, it relies on
ESock_IP yielding (otherwise it won't test different phases.
For instance DummyMCPR will artificially yield on TCFServiceProvider::TJoinRequest.
-NetMCPR will not normally yield as is.
+NetMCPR will not normally yield as is. DummyFlowFactory will yield on serving a TFindOrCreateRequest.
@internalComponent
*/
class CStartStopCrazyLoopRConnectionStep : public CStartRConnectionStep
{
public:
+ enum {
+ /*
+ * The test executes a loop of starting and then stopping a connection at discrete, growing intervals.
+ * It is crucial that enough iterations are executed, as otherwise the test isn't doing its job.
+ * The test will fail if this is detected. As iteration gaps are time-based the test first calibrates
+ * itself by running CStartStopCrazyLoopRConnectionStep::CalibrateStart to determine how
+ * much time does the start take in order to chop this span further into ELoops intevals.
+ * Calibration isn't uterrly precise and it can be that a connection startup executed within
+ * the loop completes quicker than during calibration. It has been in fact observed
+ * in the overnight builds (about 7.5%). A number of things can be done to accomdate for that.
+ * The approach chosen is to:
+ * (1) Plan for EPlannedLoops (chop down the CStartStopCrazyLoopRConnectionStep::CalibrateStart
+ * into EPlannedLoops
+ * (2) Insist on excuting at least EMandatoryLoops (the test will fail if less iterations are executed)
+ * (3) Keep on iterating beyond EPlannedLoops until the snooze slides of the connection
+ * startup time (the calbrated connection startup time equally might have been unrepresentativelly short)
+ */
+ EPlannedLoops = 15,
+ EMandatoryLoops = 14,
+ };
+
CStartStopCrazyLoopRConnectionStep(CCEsockTestBase*& aEsockTest);
+ virtual ~CStartStopCrazyLoopRConnectionStep();
+
TVerdict doSingleTestStep();
TInt CalibrateStart();
+ virtual TInt doLoopStep(TInt aTimerVal);
+
+protected:
+ RTimer iTimer;
+ TRequestStatus* ipConnectionStartStatus;
};
_LIT(KStartStopCrazyLoopRConnectionStep,"StartStopCrazyLoopRConnectionStep");
/**
+Class implementing StartCloseCrazyLoopRConnectionStep
+The test does a loop, where every iteration:
+(1) Starts the connection
+(2) Snoozes for an <interval>
+(3) Closes the connection injecting a cancel at that stage of the connection start
+(4) Increases the <interval> a bit so that next time round the cancel is injected at a different stage.
+
+Note that since the test is normally executed by a thread of lower priority than ESock_IP, it relies on
+ESock_IP yielding (otherwise it won't test different phases.
+For instance DummyMCPR will artificially yield on TCFServiceProvider::TJoinRequest.
+NetMCPR will not normally yield as is. DummyFlowFactory will yield on serving a TFindOrCreateRequest.
+
+@internalComponent
+*/
+class CStartCloseCrazyLoopRConnectionStep : public CStartStopCrazyLoopRConnectionStep
+ {
+public:
+ CStartCloseCrazyLoopRConnectionStep(CCEsockTestBase*& aEsockTest);
+ virtual TInt doLoopStep(TInt aTimerVal);
+ };
+
+_LIT(KStartCloseCrazyLoopRConnectionStep,"StartCloseCrazyLoopRConnectionStep");
+
+/**
Class implementing openrconnectionStep
@internalComponent
--- a/datacommsserver/esockserver/test/TE_EsockTestSteps/src/Connections.TestSteps.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_EsockTestSteps/src/Connections.TestSteps.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -286,6 +286,12 @@
return KErrCorrupt;
}
+ if (iEsockTest->OpenConnection(iParams) != KErrNone)
+ {
+ INFO_PRINTF1(_L("Can't reopen connection, most likely you didn't supply the session name"));
+ return KErrCorrupt;
+ }
+
timeBegin.HomeTime();
TInt error = iEsockTest->StartConnection(iParams);
if (error != KErrNone)
@@ -299,42 +305,41 @@
}
timeEnd.HomeTime();
iEsockTest->StopConnection(iParams);
+ iEsockTest->CloseConnection(iParams.iConnectionName);
+
return timeEnd.MicroSecondsFrom(timeBegin).Int64();
}
+CStartStopCrazyLoopRConnectionStep::~CStartStopCrazyLoopRConnectionStep()
+ {
+ iTimer.Close();
+ }
TVerdict CStartStopCrazyLoopRConnectionStep::doSingleTestStep()
{
// Default to failing
SetTestStepResult(EFail);
iParams.iAsynch = ETrue; //force async.
- RTimer timer;
- TInt error = timer.CreateLocal();
+ TInt error = iTimer.CreateLocal();
if (error!=KErrNone)
{
INFO_PRINTF2(_L("Creating RTimer object failed with %d"), error);
return TestStepResult();
}
- TRequestStatus timerRequestStatus;
- TRequestStatus* pConnectionStartStatus = new TRequestStatus;
- if (pConnectionStartStatus == NULL)
+ ipConnectionStartStatus = new TRequestStatus;
+ if (ipConnectionStartStatus == NULL)
{
INFO_PRINTF1(_L("Heap allocation for TRequestStatus failed"));
- timer.Close();
return TestStepResult();
}
- error = iEsockTest->iRequestStatuses.Add(pConnectionStartStatus, iParams.iConnectionName);
+ error = iEsockTest->iRequestStatuses.Add(ipConnectionStartStatus, iParams.iConnectionName); //And will be owned here
if (error!=KErrNone)
{
INFO_PRINTF2(_L("Failed "), error);
- timer.Close();
- delete pConnectionStartStatus;
return TestStepResult();
}
- TRequestStatus& connectionStartStatus = *pConnectionStartStatus;
- const TInt KLoops = 10;
INFO_PRINTF1(_L("Calibrating timer by running full start"));
//Well, we're running the full start twice as the first run is likely to take more than the representative time.
TInt timerIncrement = Min<TInt>(CalibrateStart(), CalibrateStart());
@@ -343,64 +348,119 @@
INFO_PRINTF2(_L("Full start failed, unable to calibrate, test failed with %d"), timerIncrement);
return TestStepResult();
}
- INFO_PRINTF3(_L("Start took %dus, will divide by %d and use as the increment"), timerIncrement, KLoops);
-
+ INFO_PRINTF3(_L("Start took %dus, will divide by %d and use as the increment"), timerIncrement, EPlannedLoops);
- TInt timerVal = 1;
- timerIncrement /= KLoops;
+ timerIncrement /= EPlannedLoops;
+
- INFO_PRINTF1(_L("Beginning crazy start/stop loop"));
-
- for (TInt i = 1; i < KLoops+1; i++)
+ /*=======================================================
+ * The loop
+ */
+ TInt timerVal = 1;
+ TInt i = 0;
+ INFO_PRINTF1(_L("Beginning crazy loop"));
+ while (ETrue)
{
+ if (++i > (2 * EPlannedLoops))
+ {
+ INFO_PRINTF1(_L("The test has been executing far too many iterations than can be reasonably expected, aborting.."));
+ return TestStepResult();
+ }
INFO_PRINTF2(_L("[Loop %d], Starting a new loop=============================="), i);
- INFO_PRINTF2(_L("[Loop %d], Closing connection"), i);
- iEsockTest->CloseConnection(iParams.iConnectionName);
- INFO_PRINTF2(_L("[Loop %d], Re-openning connection"), i);
+ INFO_PRINTF2(_L("***********Re-openning connection"), i);
if (iEsockTest->OpenConnection(iParams) != KErrNone)
{
INFO_PRINTF1(_L("Can't reopen connection, most likely you didn't supply the session name"));
- timer.Close();
- return TestStepResult();
- }
- INFO_PRINTF2(_L("[Loop %d], Starting connection (asynch)"), i);
- error = iEsockTest->StartConnection(iParams);
- if (error != KErrNone)
- {
- INFO_PRINTF1(_L("Starting connection failed, aborting"));
- timer.Close();
- return TestStepResult();
- }
- INFO_PRINTF3(_L("[Loop %d], Setting timer to %dus .zzz...."), i, timerVal);
- timer.After(timerRequestStatus,timerVal);
- User::WaitForRequest(timerRequestStatus,connectionStartStatus);
- if (timerRequestStatus.Int() == KRequestPending)
- {
- INFO_PRINTF2(_L("Connection Start completed with %d"), connectionStartStatus.Int());
- INFO_PRINTF1(_L("Irrespective of the start result the test has failed, because it hadn't execute enough iterations"));
- //If you get this a lot this means there;s a flaw in the logic of this test and for some reason the execution of
- //RConnection::Start speeds up with time. You may want to re-calibrate then and rerun the loop again with finer
- //interval.
- timer.Cancel();
- User::WaitForRequest(timerRequestStatus);
- timer.Close();
return TestStepResult();
}
+ error = doLoopStep(timerVal);
+ if ( error == KErrUnderflow )
+ {
+ if ( i < EMandatoryLoops )
+ {
+ INFO_PRINTF1(_L("The test didn't execute enough iterations and hence hasn't tested what needed to be tested"));
+ return TestStepResult();
+ }
+ break; //The only EPass exit condition
+ }
+ else if ( error != KErrNone )
+ {
+ INFO_PRINTF2(_L("Loop test has failed with %d"), error);
+ return TestStepResult();
+ }
timerVal += timerIncrement;
- INFO_PRINTF2(_L("[Loop %d], ....zzz. Stopping connection"), i);
- iEsockTest->StopConnection(iParams);
- User::WaitForRequest(connectionStartStatus);
- INFO_PRINTF2(_L("[Loop %d], Connection stopped"), i);
+
+ INFO_PRINTF2(_L("***********Closing connection"), i);
+ iEsockTest->CloseConnection(iParams.iConnectionName);
}
- timer.Close();
+
SetTestStepResult(EPass);
return TestStepResult();
}
+TInt CStartStopCrazyLoopRConnectionStep::doLoopStep(TInt aTimerVal)
+ {
+ TRequestStatus timerRequestStatus;
+
+ INFO_PRINTF1(_L("***********Starting connection (asynch)"));
+ TInt error = iEsockTest->StartConnection(iParams);
+ if (error != KErrNone)
+ {
+ INFO_PRINTF1(_L("Starting connection failed, aborting"));
+ return error;
+ }
+ INFO_PRINTF2(_L("***********Setting timer to %dus .zzz...."), aTimerVal);
+ iTimer.After(timerRequestStatus,aTimerVal);
+ User::WaitForRequest(timerRequestStatus, *ipConnectionStartStatus);
+ if (timerRequestStatus.Int() == KRequestPending)
+ {
+ INFO_PRINTF2(_L("Connection Start completed with %d and before the timer"), ipConnectionStartStatus->Int());
+ iTimer.Cancel();
+ User::WaitForRequest(timerRequestStatus);
+ return ipConnectionStartStatus->Int() == KErrNone ? KErrUnderflow : ipConnectionStartStatus->Int(); //Whether this is fatal for the test or not, will be determined by the caller;
+ }
+
+ INFO_PRINTF1(_L("*********** ....zzz. Stopping connection"));
+ iEsockTest->StopConnection(iParams);
+ User::WaitForRequest(*ipConnectionStartStatus);
+ INFO_PRINTF1(_L("***********Connection stopped"));
+ return KErrNone;
+ }
+// CStartCloseCrazyLoopRConnectionStep
+//-----------------
+CStartCloseCrazyLoopRConnectionStep::CStartCloseCrazyLoopRConnectionStep(CCEsockTestBase*& aEsockTest)
+: CStartStopCrazyLoopRConnectionStep(aEsockTest)
+ {
+ SetTestStepName(KStartCloseCrazyLoopRConnectionStep);
+ }
+
+TInt CStartCloseCrazyLoopRConnectionStep::doLoopStep(TInt aTimerVal)
+ {
+ TRequestStatus timerRequestStatus;
+
+ INFO_PRINTF1(_L("***********Starting connection (asynch)"));
+ TInt error = iEsockTest->StartConnection(iParams);
+ if (error != KErrNone)
+ {
+ INFO_PRINTF1(_L("Starting connection failed, aborting"));
+ return error;
+ }
+ INFO_PRINTF2(_L("***********Setting timer to %dus .zzz...."), aTimerVal);
+ iTimer.After(timerRequestStatus,aTimerVal);
+ User::WaitForRequest(timerRequestStatus, *ipConnectionStartStatus);
+ if (timerRequestStatus.Int() == KRequestPending)
+ {
+ INFO_PRINTF2(_L("Connection Start completed with %d and before the timer"), ipConnectionStartStatus->Int());
+ iTimer.Cancel();
+ User::WaitForRequest(timerRequestStatus);
+ return ipConnectionStartStatus->Int() == KErrNone ? KErrUnderflow : ipConnectionStartStatus->Int(); //Whether this is fatal for the test or not, will be determined by the caller;
+ }
+ return KErrNone;
+ }
--- a/datacommsserver/esockserver/test/TE_EsockTestSteps/src/Te_esockteststepsSuiteServer.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_EsockTestSteps/src/Te_esockteststepsSuiteServer.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -281,7 +281,9 @@
else if(aStepName.CompareF (KStartRConnectionStep) == 0)
testStep = new CStartRConnectionStep(iEsockTest);
else if(aStepName.CompareF (KStartStopCrazyLoopRConnectionStep) == 0)
- testStep = new CStartStopCrazyLoopRConnectionStep(iEsockTest);
+ testStep = new CStartStopCrazyLoopRConnectionStep(iEsockTest);
+ else if(aStepName.CompareF (KStartCloseCrazyLoopRConnectionStep) == 0)
+ testStep = new CStartCloseCrazyLoopRConnectionStep(iEsockTest);
else if(aStepName.CompareF (KAwaitRConnectionStartComplete) == 0)
testStep = new CAwaitRConnectionStartComplete(iEsockTest);
--- a/datacommsserver/esockserver/test/TE_Socket/SocketTestSection1.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_Socket/SocketTestSection1.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -313,7 +313,7 @@
{
TVerdict verdict = EPass;
- TInt numExhaustiveSockets = iNormalTest ? KNumExhaustiveSockets : 10;
+ TInt numExhaustiveSockets = iNormalTest ? KNumExhaustiveSockets : 10;
iNormalTest = EFalse; // normal test is only run once, the rest are OOM tests
Logger().WriteFormat(_L("Test Purpose: Exhaustive Socket Open"));
@@ -391,6 +391,13 @@
// go back exactly to where it was before - this makes assumptions about the ESock algorithms. Why
// wouldn't ESock legitimately cache objects, for example?
//TESTL(sockNum >= sockCount1);
+ TESTL(sockNum >= sockCount1);
+
+ Logger().WriteFormat(_L("Freeing sockets in creation order"));
+ for (i=0; i<sockNum; i++)
+ {
+ socks[i].Close();
+ }
//
// NOTE:
@@ -404,6 +411,7 @@
CleanupStack::PopAndDestroy(socks);
CleanupStack::Pop(&ss);
+ Logger().WriteFormat(_L("Now closing socket server session without closing %d opened sockets"), sockNum);
ss.Close();
SetTestStepResult(verdict);
return verdict;
--- a/datacommsserver/esockserver/test/providers/dummy/src/dummypr_factory.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/providers/dummy/src/dummypr_factory.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -329,6 +329,8 @@
ACommsFactoryNodeId* CDummyFlowFactory::DoFindOrCreateObjectL(TFactoryQueryBase& aQuery)
{
const TDefaultFlowFactoryQuery& query = static_cast<const TDefaultFlowFactoryQuery&>(aQuery);
+ User::After(0.3*1000000); //Artificial yield to test cancellation. Do not remove.
+
if(query.iMessageId != TCFServiceProvider::TCommsBinderRequest::Id())
{
//the factory only reacts to creation triggered by TCommsBinderRequest
--- a/datacommsserver/esockserver/test/providers/dummy/src/dummypr_subconnprov.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/providers/dummy/src/dummypr_subconnprov.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -119,7 +119,7 @@
if (iContext.iMessage.IsMessage<Messages::TEBase::TError>())
{
ASSERT(iContext.iNodeActivity);
- iContext.iNodeActivity->SetPostedTo(iContext.iNodeActivity->SoleOriginator().Peer().RecipientId());
+ iContext.iNodeActivity->SetPostedTo(iContext.iNodeActivity->SoleOriginator().Peer());
}
return EFalse;
}
--- a/datacommsserver/esockserver/test/te_mecunittest/group/scripts/te_mecunittest.script Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/te_mecunittest/group/scripts/te_mecunittest.script Mon Oct 04 02:21:43 2010 +0300
@@ -200,6 +200,26 @@
END_TESTCASE MEC_UNIT_TEST_012
+START_TESTCASE MEC_UNIT_TEST_013
+//! @SYMTestCaseID MEC_UNIT_TEST_013
+//! @SYMTestCaseDesc Test NULL return for RMetaExtensionContainerC::FindExtension() with un-opened container
+//! @SYMFssID COMMS-INFRAS/Esock/MetaExtensionContainer/UnitTest
+//! @SYMTestActions 1) FindExtension T1 in constMec
+//! @SYMTestExpectedResults NULL return code
+RUN_TEST_STEP 60 te_mecunittest MecTest013
+END_TESTCASE MEC_UNIT_TEST_013
+
+
+START_TESTCASE MEC_UNIT_TEST_014
+//! @SYMTestCaseID MEC_UNIT_TEST_014
+//! @SYMTestCaseDesc Test KErrNotFound leave for RMetaExtensionContainerC::FindExtensionL() with un-opened container
+//! @SYMFssID COMMS-INFRAS/Esock/MetaExtensionContainer/UnitTest
+//! @SYMTestActions 1) FindExtensionL T1 in constMec
+//! @SYMTestExpectedResults Leaves with KErrNotFound
+RUN_TEST_STEP 60 te_mecunittest MecTest014
+END_TESTCASE MEC_UNIT_TEST_014
+
+
////////////////////////////////////////////////
// Container Branching Tests
////////////////////////////////////////////////
@@ -488,30 +508,6 @@
END_TESTCASE MEC_UNIT_TEST_104
-START_TESTCASE MEC_UNIT_TEST_105
-//! @SYMTestCaseID MEC_UNIT_TEST_105
-//! @SYMTestCaseDesc Test Panic mecpanic:1 (ENoImplementation) for RMetaExtensionContainerC::FindExtension()
-//! @SYMFssID COMMS-INFRAS/Esock/MetaExtensionContainer/UnitTest
-//! @SYMTestActions 1) FindExtension T1 in constMec
-//! @SYMTestExpectedResults Panic mecpanic:1
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-RUN_PANIC_STEP_RESULT 1 mecpanic 60 te_mecunittest MecTestPanic5
-END_TESTCASE MEC_UNIT_TEST_105
-
-
-START_TESTCASE MEC_UNIT_TEST_106
-//! @SYMTestCaseID MEC_UNIT_TEST_106
-//! @SYMTestCaseDesc Test Panic mecpanic:1 (ENoImplementation) for RMetaExtensionContainerC::FindExtensionL()
-//! @SYMFssID COMMS-INFRAS/Esock/MetaExtensionContainer/UnitTest
-//! @SYMTestActions 1) FindExtensionL T1 in constMec
-//! @SYMTestExpectedResults Panic mecpanic:1
-//! @SYMTestPriority Critical
-//! @SYMTestStatus Implemented
-RUN_PANIC_STEP_RESULT 1 mecpanic 60 te_mecunittest MecTestPanic6
-END_TESTCASE MEC_UNIT_TEST_106
-
-
START_TESTCASE MEC_UNIT_TEST_107
//! @SYMTestCaseID MEC_UNIT_TEST_107
//! @SYMTestCaseDesc Test Panic mecpanic:3 (EAlreadyOpen) for RMetaExtensionContainer::Open()
--- a/datacommsserver/esockserver/test/te_mecunittest/group/te_mecunittest.mmp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/te_mecunittest/group/te_mecunittest.mmp Mon Oct 04 02:21:43 2010 +0300
@@ -54,6 +54,8 @@
SOURCE mectest010step.cpp
SOURCE mectest011step.cpp
SOURCE mectest012step.cpp
+SOURCE mectest013step.cpp
+SOURCE mectest014step.cpp
SOURCE mectest030step.cpp
SOURCE mectest031step.cpp
@@ -71,8 +73,6 @@
SOURCE mectestpanic2step.cpp
SOURCE mectestpanic3step.cpp
SOURCE mectestpanic4step.cpp
-SOURCE mectestpanic5step.cpp
-SOURCE mectestpanic6step.cpp
SOURCE mectestpanic7step.cpp
SOURCE mectestpanic8step.cpp
SOURCE mectestpanic9step.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/datacommsserver/esockserver/test/te_mecunittest/inc/mectest013step.h Mon Oct 04 02:21:43 2010 +0300
@@ -0,0 +1,49 @@
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+// mectest013step.h
+//
+
+/**
+@file
+*/
+
+
+#ifndef MECTEST013STEP_H
+#define MECTEST013STEP_H
+
+#include "mecunitteststepbase.h"
+
+
+_LIT(KMecTest013Step, "MecTest013");
+
+
+class CMecTest013Step : public CMecUnitTestStepBase
+ {
+public:
+ virtual ~CMecTest013Step();
+
+public:
+ explicit CMecTest013Step()
+ : CMecUnitTestStepBase(KMecTest013Step)
+ {
+ }
+
+ virtual TVerdict RunTestStepL();
+ };
+
+#endif
+// MECTEST013STEP_H
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/datacommsserver/esockserver/test/te_mecunittest/inc/mectest014step.h Mon Oct 04 02:21:43 2010 +0300
@@ -0,0 +1,49 @@
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+// mectest014step.h
+//
+
+/**
+@file
+*/
+
+
+#ifndef MECTEST014STEP_H
+#define MECTEST014STEP_H
+
+#include "mecunitteststepbase.h"
+
+
+_LIT(KMecTest014Step, "MecTest014");
+
+
+class CMecTest014Step : public CMecUnitTestStepBase
+ {
+public:
+ virtual ~CMecTest014Step();
+
+public:
+ explicit CMecTest014Step()
+ : CMecUnitTestStepBase(KMecTest014Step)
+ {
+ }
+
+ virtual TVerdict RunTestStepL();
+ };
+
+#endif
+// MECTEST014STEP_H
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/datacommsserver/esockserver/test/te_mecunittest/src/mectest013step.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -0,0 +1,48 @@
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+// mectest013step.cpp
+//
+
+/**
+@file
+*/
+
+#include "mectest013step.h"
+#include "testextensions.h"
+#include "metaextensioncontainerspy.h"
+#include <comms-infras/ss_rmetaextensioncontainer.h>
+#include <comms-infras/ss_commsprov.h>
+
+using namespace ESock;
+
+CMecTest013Step::~CMecTest013Step()
+ {
+ }
+
+
+/**
+//! @SYMTestCaseID MEC_UNIT_TEST_013
+//! @SYMTestCaseDesc Test NULL return for RMetaExtensionContainerC::FindExtension() with un-opened container
+//! @SYMFssID COMMS-INFRAS/Esock/MetaExtensionContainer/UnitTest
+//! @SYMTestActions 1) FindExtension T1 in constMec
+//! @SYMTestExpectedResults NULL return code
+*/
+TVerdict CMecTest013Step::RunTestStepL()
+ {
+ RMetaExtensionContainerC mec;
+ const Meta::SMetaData* ext = mec.FindExtension(TTestExtension1::TypeId());
+ return ext == NULL ? EPass : EFail;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/datacommsserver/esockserver/test/te_mecunittest/src/mectest014step.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -0,0 +1,48 @@
+// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+// mectest014step.cpp
+//
+
+/**
+@file
+*/
+
+#include "mectest014step.h"
+#include "testextensions.h"
+#include "metaextensioncontainerspy.h"
+#include <comms-infras/ss_rmetaextensioncontainer.h>
+#include <comms-infras/ss_commsprov.h>
+
+using namespace ESock;
+
+CMecTest014Step::~CMecTest014Step()
+ {
+ }
+
+
+/**
+//! @SYMTestCaseID MEC_UNIT_TEST_014
+//! @SYMTestCaseDesc Test KErrNotFound leave for RMetaExtensionContainerC::FindExtensionL() with un-opened container
+//! @SYMFssID COMMS-INFRAS/Esock/MetaExtensionContainer/UnitTest
+//! @SYMTestActions 1) FindExtensionL T1 in constMec
+//! @SYMTestExpectedResults Leaves with KErrNotFound
+*/
+TVerdict CMecTest014Step::RunTestStepL()
+ {
+ RMetaExtensionContainerC mec;
+ TRAPD(err, const Meta::SMetaData& ext = mec.FindExtensionL(TTestExtension1::TypeId()));
+ return err == KErrNotFound ? EPass : EFail;
+ }
+
--- a/datacommsserver/esockserver/test/te_mecunittest/src/mecunittestserver.cpp Fri Sep 17 08:36:26 2010 +0300
+++ b/datacommsserver/esockserver/test/te_mecunittest/src/mecunittestserver.cpp Mon Oct 04 02:21:43 2010 +0300
@@ -39,6 +39,8 @@
#include "mectest010step.h"
#include "mectest011step.h"
#include "mectest012step.h"
+#include "mectest013step.h"
+#include "mectest014step.h"
#include "mectest030step.h"
#include "mectest031step.h"
@@ -57,8 +59,6 @@
#include "mectestpanic2step.h"
#include "mectestpanic3step.h"
#include "mectestpanic4step.h"
-#include "mectestpanic5step.h"
-#include "mectestpanic6step.h"
#include "mectestpanic7step.h"
#include "mectestpanic8step.h"
#include "mectestpanic9step.h"
@@ -170,6 +170,8 @@
TEST_STEP(MecTest010)
TEST_STEP(MecTest011)
TEST_STEP(MecTest012)
+ TEST_STEP(MecTest013)
+ TEST_STEP(MecTest014)
TEST_STEP(MecTest030)
TEST_STEP(MecTest031)
@@ -186,9 +188,9 @@
// TEST_STEP(MecTestPanic1)
TEST_STEP(MecTestPanic2)
TEST_STEP(MecTestPanic3)
- TEST_STEP(MecTestPanic4)
- TEST_STEP(MecTestPanic5)
- TEST_STEP(MecTestPanic6)
+ TEST_STEP(MecTestPanic4)
+ // MecTestPanic5 and MecTestPanic6 removed as FindExtension()/FindExtensionL()
+ // no longer panic if container hasn't been opened.
TEST_STEP(MecTestPanic7)
TEST_STEP(MecTestPanic8)
TEST_STEP(MecTestPanic9)