Topic Text   Topic Comments (0)   Topic Properties   Topic Information lettam@hot...
Topic title: eeee Tuesday November 10, 2009 07:21:09

Download topic text | View in variable-width font | Tab width set to 4 (change to 8)

Files in topic:  
[Jump to] C:\temp\diff.out   {+1489,-0}

[Add General Comment] to topic.

File C:\temp\diff.out (Revision 1.0) [Add File Comment] [Top]
 
1 ********************************
2 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmAgentSysL/roamPmAgentSysLU/external/src/Connection.cc@@/main/pre_dolphin_3.1/0
3 >>> file 2: ./roamPmAgentSysL/roamPmAgentSysLU/external/src/Connection.cc
4 ********************************
5 -------------[after 195]---------------|-------------[inserted 196]------------
6 -| INFO(STR("enter send+
7 |-
8 -------------[after 197]---------------|-------------[inserted 199]------------
9 -| INFO(STR("enter send+
10 |-
11 -------------[after 204]---------------|-------------[inserted 207]------------
12 -| INFO(STR("enter send()"));
13 |-
14 -------------[after 208]---------------|-------------[inserted 212]------------
15 -| INFO(STR("enter send1()"));
16 |-
17 -------------[after 215]---------------|-------------[inserted 220]------------
18 -| INFO(STR("enter send2()"));
19 |-
20 ********************************
21 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/build/RlibCommonConfig.conf@@/main/dolphin_inc2.4/0
22 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/build/RlibCommonConfig.conf
23 ********************************
24 -----------[deleted 42-47]-------------|---------------[after 41]--------------
25 // eventBufferMaxFillSize indicates+|-
26 // will be sent |
27 //sp_pmAgent_eventBufferMaxFillSize 30+|
28 //mp_pmAgent_eventBufferMaxFillSize 15+|
29 //modOm_pmController_eventBufferMaxFil+|
30 //cenOm_pmController_eventBufferMaxFil+|
31 -|
32 -------------[changed 96]--------------|-----------[changed to 90-91]----------
33 | fetchTimeout 2000
34 -| fetchRspTimeout 2000
35 |-
36 ********************************
37 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/conf/block_test.conf@@/main/dolphin_inc2.4/0
38 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/conf/block_test.conf
39 ********************************
40 -------------[changed 9]---------------|-----------[changed to 9-11]-----------
41 trace.register(traceLogger('HtmlLogger+|
42 -| trace.register(traceLogger('StdOutLogg+
43 | trace.register(traceLogger('HtmlLogger+
44 |-
45 -------------[changed 31]--------------|------------[changed to 33]------------
46 restart.start_Lm(xterm=True) | restart.start_Lm(xterm=True, purecov=T+
47 -|-
48 -------------[changed 51]--------------|------------[changed to 53]------------
49 restart.restart_Lm(xterm=True) | #restart.restart_Lm(xterm=True, pureco+
50 -|-
51 -------------[changed 54]--------------|------------[changed to 56]------------
52 restart.restart_ModMp() | #restart.restart_ModMp()
53 -|-
54 -------------[changed 57]--------------|------------[changed to 59]------------
55 gpeh.gpeh_ModMp() | #gpeh.gpeh_ModMp()
56 -|-
57 -------------[changed 60]--------------|------------[changed to 62]------------
58 ctr.ctr_ModMp() | #ctr.ctr_ModMp()
59 -|-
60 -------------[changed 63]--------------|------------[changed to 65]------------
61 uetr.uetr_ModMp() | #uetr.uetr_ModMp()
62 -|-
63 -------------[changed 66]--------------|------------[changed to 68]------------
64 statistics.statistics_testsuite() | #statistics.statistics_testsuite()
65 -|-
66 ********************************
67 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/conf/pmController.cfg@@/main/dolphin_inc2.4/0
68 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/conf/pmController.cfg
69 ********************************
70 -------------[changed 6]---------------|-------------[changed to 6]------------
71 SET_BASE_PURIFYOPTIONS -max_threads=64+| SET_BASE_PURIFYOPTIONS -max_threads=64+
72 -|-
73 --------------[after 9]----------------|-------------[inserted 10]-------------
74 -|
75 |-
76 -------------[changed 11]--------------|------------[changed to 12]------------
77 UNIX_COMMAND \rm -fr `/usr/atria/bin/c+| #UNIX_COMMAND \rm -fr `/usr/atria/bin/+
78 -|-
79 --------------[after 16]---------------|-------------[inserted 18]-------------
80 -|
81 |-
82 --------------[after 19]---------------|------------[inserted 22-26]-----------
83 -|
84 | #BUILD_COMMAND xterm -e /home/eqingso/+
85 |
86 | #BUILD_COMMAND /vobs/rnc/tdscdma/struc+
87 |
88 |-
89 --------------[after 20]---------------|------------[inserted 28-31]-----------
90 -|
91 | # BUILD_COMMAND sleep 30
92 |
93 | # BUILD_COMMAND python block_test.conf
94 |-
95 -------------[changed 39]--------------|------------[changed to 50]------------
96 POST_PROCESS_COMMAND /vobs/rnc/tdscdma+| POST_PROCESS_COMMAND /cc/tdrnc_1views/+
97 -|-
98 ********************************
99 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/conf/pyenv@@/main/dolphin_inc2.4/0
100 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/conf/pyenv
101 ********************************
102 -------------[changed 1]---------------|-------------[changed to 1]------------
103 module load python | #module load python
104 -|-
105 ********************************
106 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/external/src/pmBlockBoot.cc@@/main/dolphin_inc2.4/0
107 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/external/src/pmBlockBoot.cc
108 ********************************
109 --------------[after 24]---------------|------------[inserted 25-27]-----------
110 -| PmController* pmController = NULL;
111 | Connection *connectionUpwards = NULL;
112 | Connection **connectionDownwards = NUL+
113 |-
114 -----------[deleted 28-29]-------------|---------------[after 30]--------------
115 Connection *connectionUpwards; |-
116 Connection **connectionDownwar+|
117 -|
118 --------------[after 35]---------------|-------------[inserted 37]-------------
119 -|
120 |-
121 ------------[changed 144]--------------|------------[changed to 146]-----------
122 PmController* pmController = n+| pmController = new PmControlle+
123 -|-
124 -------------[after 204]---------------|-------------[inserted 207]------------
125 -| struct cleanBlockReq cleanBlockReq;
126 |-
127 ------------[changed 220]--------------|------------[changed to 223]-----------
128 void startPmNativeProc() | PROCESS startPmNativeProc()
129 -|-
130 -------------[after 232]---------------|-------------[inserted 236]------------
131 -| return PMNA;
132 |-
133 -------------[after 239]---------------|-------------[inserted 244]------------
134 -| PROCESS pmna = 0;
135 |-
136 ------------[changed 270]--------------|------------[changed to 275]-----------
137 startPmNativeProc(); | pmna = startPmNativeProc();
138 -|-
139 -------------[after 274]---------------|-----------[inserted 280-288]----------
140 -| case CLEAN_BLOCK_REQ:
141 | {
142 | INFO("CLEAN_BLOCK_REQ");
143 | kill_proc(pmna);
144 | union SIGNAL *rsp_p = alloc(si+
145 | send(&rsp_p, sender(&rec_p));
146 | free_buf(&rec_p);
147 | break;
148 | }
149 |-
150 ------------[changed 277]--------------|------------[changed to 291]-----------
151 INFO("Unknown signal received+| INFO(STR("Unknown signal recei+
152 -|-
153 ********************************
154 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/pytest/pmutils/BTCtrl.py@@/main/dolphin_inc2.4/0
155 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/pytest/pmutils/BTCtrl.py
156 ********************************
157 --------------[after 32]---------------|-------------[inserted 33]-------------
158 -| print "Now we are in t+
159 |-
160 --------------[after 43]---------------|------------[inserted 45-46]-----------
161 -| import+
162 | time.s+
163 |-
164 -------------[changed 46]--------------|------------[changed to 49]------------
165 |
166 -|-
167 -------------[changed 48]--------------|------------[changed to 51]------------
168 "Will kill the LM unde+| print "Will kill the L+
169 -|-
170 --------------[after 49]---------------|-------------[inserted 53]-------------
171 -| print self.lm
172 |-
173 --------------[after 50]---------------|------------[inserted 55-57]-----------
174 -| print +
175 | import+
176 | time.s+
177 |-
178 --------------[after 53]---------------|-------------[inserted 61]-------------
179 -| +
180 |-
181 --------------[after 76]---------------|------------[inserted 85-87]-----------
182 -| import time
183 | time.sleep(10)
184 |
185 |-
186 -----------[changed 95-96]-------------|----------[changed to 106-111]---------
187 stopTest = test_contai+| import time
188 self.send(stopTest) | time.sleep(5)
189 -| stopTest = test_contai+
190 | self.send(stopTest)
191 | import time
192 | time.sleep(5)
193 |-
194 ********************************
195 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/pytest/pmutils/Constants.py@@/main/dolphin_inc2.4/0
196 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/pytest/pmutils/Constants.py
197 ********************************
198 ------------[changed 1-8]--------------|-------------[changed to 1]------------
199 # add by eqiglii |
200 MAX_CTR_UE = 16; |-
201 MAX_STATISTICAL_SCANNERS = 30; |
202 MAX_GPEH_SCANNERS = 22; |
203 MAX_EBS_SCANNERS = 2; |
204 MAX_UETR_SCANNERS = 16; |
205 MAX_CTR_SCANNERS = 2; |
206 # end of eqiglii |
207 -|
208 -------------[deleted 18]--------------|---------------[after 10]--------------
209 |-
210 -|
211 --------------[after 23]---------------|------------[inserted 16-25]-----------
212 -| MAX_CTR_UE=16
213 | #MAX_STATISTICAL_SCANNERS=30
214 | MAX_STATISTICAL_SCANNERS=29 # LM c+
215 | MAX_GPEH_SCANNERS=22
216 | MAX_EBS_SCANNERS=2
217 | MAX_UETR_SCANNERS=16
218 | MAX_CTR_SCANNERS=2
219 | #MAX_MOD_MP_PM_CONTROLLERS = 27
220 | MAX_MOD_MP_PM_CONTROLLERS = 14 # Test+
221 | MAX_PM_AGENTS = 6
222 |-
223 ********************************
224 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/pytest/pmutils/DhStub.py@@/main/dolphin_inc2.4/0
225 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/pytest/pmutils/DhStub.py
226 ********************************
227 -----------[changed 29-37]-------------|-----------[changed to 29-37]----------
228 def resurrect(self): | # def resurrect(self):
229 "Things I do when I've+| # "Things I do when I've+
230 if not self.PhantomRun+| # if not self.PhantomRun+
231 TestStub.TestS+| # TestStub.TestS+
232 self.hasPlayed+| # self.hasPlayed+
233 servIndSig = R+| # servIndSig = R+
234 servIndSig['se+| # servIndSig['se+
235 reaction = (se+| # reaction = (se+
236 self.expect(Ro+| # self.expect(Ro+
237 -|-
238 -------------[changed 42]--------------|------------[changed to 42]------------
239 lnhSig['linkHandlerNam+| lnhSig['linkHandlerNam+
240 -|-
241 ********************************
242 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/pytest/pmutils/PmAgent.py@@/main/dolphin_inc2.4/0
243 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/pytest/pmutils/PmAgent.py
244 ********************************
245 -------------[changed 58]--------------|------------[changed to 58]------------
246 TestStub.TestStub.__in+| TestStub.TestStub.__in+
247 -|-
248 ********************************
249 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/pytest/pmutils/Tsv.py@@/main/dolphin_inc2.4/0
250 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/pytest/pmutils/Tsv.py
251 ********************************
252 -------------[changed 28]--------------|------------[changed to 28]------------
253 def reset(self): | def reset(self, totalReset=True):
254 -|-
255 --------------[after 34]---------------|-------------[inserted 35]-------------
256 -| self.ueSupervision = []
257 |-
258 --------------[after 35]---------------|------------[inserted 37-38]-----------
259 -| if totalReset==True:
260 | self.activeObs = dict()
261 |-
262 --------------[after 58]---------------|------------[inserted 62-83]-----------
263 -| def addActiveObs(self, obsId, scanne+
264 | if obsId not in self.activeObs:
265 | self.activeObs[obsId] = {'scanne+
266 | return True
267 | elif obsId in self.activeObs and s+
268 | self.activeObs[obsId]['no'] = se+
269 | return True
270 | return False
271 |
272 | def removeActiveObs(self, obsId, sca+
273 | if obsId in self.activeObs and sel+
274 | self.activeObs[obsId]['no'] = se+
275 | if self.activeObs[obsId]['no'] =+
276 | del self.activeObs[obsId]
277 | return True +
278 | return False
279 |
280 | def addToUeSupervisionFilter(self, u+
281 | self.ueSupervision.append(ueInd)
282 |
283 | def removeFromUeSupervisionFilter(se+
284 | self.ueSupervision.remove(ueInd)
285 |-
286 ********************************
287 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/pytest/signalfiles/SupportingStructs.py@@/main/dolphin_inc2.4/0
288 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/pytest/signalfiles/SupportingStructs.py
289 ********************************
290 ------------[changed 490]--------------|------------[changed to 490]-----------
291 def __init__(self, eventId = -+| def __init__(self, eventId = -+
292 -|-
293 -------------[after 503]---------------|-----------[inserted 504-505]----------
294 -| # no support for scannerBitSet
295 | self.scannerBitSet = 0
296 |-
297 ------------[changed 510]--------------|------------[changed to 512]-----------
298 return 5+8+1+len(self.+| return 5+1+8+1+len(sel+
299 -|-
300 -------------[after 515]---------------|-----------[inserted 518-520]----------
301 -| # no support for scannerBitSet
302 | self.scannerBitSet = r+
303 | self.scannerBitSet = 0
304 |-
305 ------------[changed 517]--------------|------------[changed to 522]-----------
306 self.rncModuleId = rea+| self.rncModuleId = rea+
307 -|-
308 ------------[changed 521]--------------|------------[changed to 526]-----------
309 c.unserialize(+| c.unserialize(+
310 -|-
311 ------------[changed 523]--------------|------------[changed to 528]-----------
312 self.ueContextId = rea+| self.ueContextId = rea+
313 -|-
314 -------------[after 524]---------------|-------------[inserted 530]------------
315 -| self.params = []
316 |-
317 ----------[changed 532-533]------------|----------[changed to 538-540]---------
318 writer.int32(1+1+8+len+| writer.int32(self.scan+
319 writer.int32(self.rncM+| writer.int32(1+8+1+len+
320 -| writer.int32(self.rncM+
321 |-
322 ----------[changed 535-536]------------|----------[changed to 542-543]---------
323 c.serialize(wr+| c.serialize(wr+
324 writer.int32(self.ueCo+| writer.int32(self.ueCo+
325 -|-
326 ********************************
327 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/pytest/signalfiles/roamIfPmController.py@@/main/dolphin_inc2.4/0
328 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/pytest/signalfiles/roamIfPmController.py
329 ********************************
330 ----------[deleted 525-526]------------|--------------[after 524]--------------
331 self['endOfRop'] = bool(0x01 & rea+|-
332 self['fetchResponse'] = bool(0x01 +|
333 -|
334 ---------[deleted/moved 527]-----------|----------[after 524 now 527]----------
335 self['flush'] = bool(0x01 & reader+|-
336 -|
337 ---------[after 529 was 527]-----------|----------[inserted/moved 527]---------
338 -| self['flush'] = bool(0x01 & reader+
339 |-
340 ----------[deleted 542-543]------------|--------------[after 539]--------------
341 writer.int8(self['endOfRop']) |-
342 writer.int8(self['fetchResponse']) |
343 -|
344 ---------[deleted/moved 544]-----------|----------[after 539 now 542]----------
345 writer.int8(self['flush']) |-
346 -|
347 ---------[after 546 was 544]-----------|----------[inserted/moved 542]---------
348 -| writer.int8(self['flush'])
349 |-
350 ********************************
351 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/pytest/tc/restart.py@@/main/dolphin_inc2.4/0
352 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/pytest/tc/restart.py
353 ********************************
354 ------------[changed 137]--------------|------------[changed to 137]-----------
355 def start_Lm(lmName = '000300', exec_p+| def start_Lm(lmName = '000300', exec_p+
356 -|-
357 ------------[changed 143]--------------|------------[changed to 143]-----------
358 exec_path = '/dev5/vob+| exec_path = '/vobs/rnc+
359 -|-
360 ------------[changed 148]--------------|------------[changed to 148]-----------
361 def restart_Lm(exec_path = None, debug+| def restart_Lm(exec_path = None, debug+
362 -|-
363 ********************************
364 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/pytest/tc/teststep.py@@/main/dolphin_inc2.4/0
365 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/pytest/tc/teststep.py
366 ********************************
367 -------------[deleted 53]--------------|---------------[after 52]--------------
368 |-
369 -|
370 ------------[changed 255]--------------|------------[changed to 254]-----------
371 sub.expect(StartScanSignal, scanne+| #sub.expect(StartScanSignal, scann+
372 -|-
373 ------------[changed 358]--------------|------------[changed to 357]-----------
374 cenCebs['endOfRop'] = False # ??? | cenCebs['flush'] = True # ???
375 -|-
376 ------------[changed 360]--------------|------------[changed to 359]-----------
377 cenCebs['flush'] = False # ??? | cenCebs['numUnacknowledged'] = 2
378 -|-
379 ----------[deleted 534-535]------------|--------------[after 532]--------------
380 ebs['endOfRop'] = True |-
381 ebs['fetchResponse'] = False |
382 -|
383 ---------[deleted/moved 536]-----------|----------[after 532 now 535]----------
384 ebs['flush'] = True |-
385 -|
386 ---------[after 538 was 536]-----------|----------[inserted/moved 535]---------
387 -| ebs['flush'] = True
388 |-
389 ------------[changed 547]--------------|------------[changed to 544]-----------
390 ebs['buffer'].append(Event(event['+| ebs['buffer'].append(Event(event['+
391 -|-
392 ********************************
393 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/testcont_swu/test_container.c@@/main/dolphin_inc2.4/0
394 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/testcont_swu/test_container.c
395 ********************************
396 -------------[changed 3]---------------|-------------[changed to 3]------------
397 | #include "/vobs/cello/cade_struct/incl+
398 -|-
399 --------------[after 14]---------------|------------[inserted 15-16]-----------
400 -| struct cleanBlockReq cleanBlockReq;
401 | struct logWriteIndS logWriteIndS;
402 |-
403 -------------[changed 54]--------------|-----------[changed to 56-57]----------
404 | int blocktestNum = 0;
405 -|
406 |-
407 -------------[changed 72]--------------|------------[changed to 75]------------
408 INFO("+| INFO(S+
409 -|-
410 --------------[after 75]---------------|-------------[inserted 79]-------------
411 -| delay(+
412 |-
413 -------------[changed 83]--------------|-----------[changed to 87-95]----------
414 +| +
415 -| +
416 | /* purify_new_leaks(); */
417 | +
418 | +
419 | +
420 | +
421 | +
422 | +
423 |-
424 -------------[changed 90]--------------|------------[changed to 102]-----------
425 +| +
426 -|-
427 -------------[changed 99]--------------|----------[changed to 111-117]---------
428 +| +
429 -| +
430 | +
431 | +
432 | +
433 | +
434 | +
435 |-
436 ------------[changed 105]--------------|------------[changed to 123]-----------
437 +| +
438 -|-
439 -------------[after 109]---------------|-----------[inserted 128-133]----------
440 -| case LOG_WRITE_IND:
441 | {
442 | INFO(STR("PYTHON:%s",rec_p->logWr+
443 | free_+
444 | break+
445 | }
446 |-
447 ------------[changed 112]--------------|------------[changed to 136]-----------
448 INFO("+| TRACE_+
449 -|-
450 ********************************
451 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/rlibPmControllerTest/testcont_swu/test_container.sig@@/main/dolphin_inc2.4/0
452 >>> file 2: ./roamPmControllerBl/rlibPmControllerTest/testcont_swu/test_container.sig
453 ********************************
454 -----------[changed 10-11]-------------|-----------[changed to 10-11]----------
455 | #define TRACE_MONITOR_SIGBASE +
456 | #define LOG_MAX_DATA_LEN 512
457 -|-
458 --------------[after 12]---------------|------------[inserted 13-67]-----------
459 -| typedef enum
460 | {
461 | GROUP_CHECK, /* Check failed+
462 | GROUP_ERROR, /* Error raised+
463 | GROUP_ENTER, /* Enter trace +
464 | GROUP_RETURN, /* Return trace+
465 | GROUP_INFO, /* Information +
466 | GROUP_TRACE1, /* General trac+
467 | GROUP_TRACE2, /* General trac+
468 | GROUP_TRACE3, /* General trac+
469 | GROUP_TRACE4, /* General trac+
470 | GROUP_TRACE5, /* General trac+
471 | GROUP_TRACE6, /* General trac+
472 | GROUP_TRACE7, /* General trac+
473 | GROUP_TRACE8, /* General trac+
474 | GROUP_TRACE9, /* General trac+
475 | GROUP_STATE_CHANGE, /* State change+
476 | GROUP_BUS_SEND, /* Bus message +
477 | GROUP_BUS_RECEIVE, /* Bus message +
478 | GROUP_REC_SIG, /* Signal recei+
479 | GROUP_SEND_SIG, /* Signal recei+
480 | GROUP_PARAM, /* Signal recei+
481 | GROUP_INTERFACE, /* Interface tr+
482 | GROUP_TRACE_OBJ, /* Trace object+
483 | GROUP_CONTINUATION, /* Continuation+
484 | GROUP_RESERVED1, /* Reserved for+
485 | GROUP_RESERVED2, /* Reserved for+
486 | GROUP_RESERVED3, /* Reserved for+
487 | GROUP_RESERVED4, /* Reserved for+
488 | GROUP_RESERVED5, /* Reserved for+
489 | /*
490 | ** User defined errors and trace gro+
491 | ** handling is performed on a per pr+
492 | ** be redefined and used freely in a+
493 | */
494 | GROUP_USER1, /* User define+
495 | GROUP_USER2, /* User define+
496 | GROUP_USER3, /* User define+
497 | GROUP_USER4 /* User define+
498 | } groupE;
499 |
500 |
501 | struct logDataS
502 | {
503 | U32 absTimeSec; /* The +
504 | U32 absTimeTick; /* The +
505 | U16 lineNo; /* Line+
506 | U16 fileNamePos; /* Name+
507 | U16 procNamePos; /* Name+
508 | U16 msgPos; /* Posi+
509 | U16 binDataPos; /* Pos +
510 | U16 binDataLen; /* The +
511 | groupE group; /* Trace grou+
512 | U8 data[LOG_MAX_DATA_LE+
513 | };
514 |-
515 -------------[changed 35]--------------|----------[changed to 90-105]----------
516 | #define CLEAN_BLOCK_REQ (TEST_CONTAINE+
517 -| struct cleanBlockReq
518 | {
519 | SIGSELECT sigNo;
520 | int location;
521 | };
522 |
523 | #define CLEAN_BLOCK_RSP (TEST_CONTAINE+
524 |
525 | #define LOG_WRITE_IND (TRACE_MONITOR_S+
526 | struct logWriteIndS
527 | {
528 | SIGSELECT sigNo;
529 | U16 logDataSize;
530 | struct logDataS logData;
531 | };
532 |-
533 ********************************
534 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/inc/AckumulatingCollectorManager.h@@/main/dolphin_inc2.4/0
535 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/inc/AckumulatingCollectorManager.h
536 ********************************
537 -------------[changed 13]--------------|------------[changed to 13]------------
538 static AckumulatingCollectorManager*+| static AckumulatingCollectorManager*+
539 -|-
540 -------------[changed 18]--------------|------------[changed to 18]------------
541 static AckumulatingCollectorManager*+| static AckumulatingCollectorManager*+
542 -|-
543 -------------[changed 63]--------------|------------[changed to 63]------------
544 static AckumulatingCollectorManager*+| static AckumulatingCollectorManager*+
545 -|-
546 ********************************
547 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/inc/CounterFilter.h@@/main/dolphin_inc2.4/0
548 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/inc/CounterFilter.h
549 ********************************
550 --------------[after 36]---------------|------------[inserted 37-40]-----------
551 -| // Copy constructor
552 | CounterFilter(const CounterFilter +
553 | // Assignment operator
554 | CounterFilter & operator=(const Co+
555 |-
556 ********************************
557 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/inc/CtrScanner.h@@/main/dolphin_inc2.4/0
558 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/inc/CtrScanner.h
559 ********************************
560 -------------[changed 76]--------------|------------[changed to 76]------------
561 void extractActivationEvents(int act+| void extractActivationEvents_ctr(int+
562 -|-
563 -------------[changed 80]--------------|------------[changed to 80]------------
564 int getAddedOrRemovedUe(int* oldList+| int getAddedOrRemovedUe_ctr(int* old+
565 -|-
566 ********************************
567 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/inc/EventCollector.h@@/main/dolphin_inc2.4/0
568 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/inc/EventCollector.h
569 ********************************
570 -------------[changed 50]--------------|------------[changed to 50]------------
571 int index = scannerId % 10000; | int _index = scannerId % 10000;
572 -|-
573 -------------[changed 53]--------------|------------[changed to 53]------------
574 index += 2; | _index += 2;
575 -|-
576 -------------[changed 55]--------------|------------[changed to 55]------------
577 return index; | return _index;
578 -|-
579 -------------[changed 60]--------------|------------[changed to 60]------------
580 void init(); | void initEventCollector();
581 -|-
582 ********************************
583 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/inc/EventScanner.h@@/main/dolphin_inc2.4/0
584 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/inc/EventScanner.h
585 ********************************
586 -----------[changed 34-35]-------------|-----------[changed to 34-35]----------
587 void addActivationEventUe(int rncMod+| virtual void addActivationEventUe(i+
588 void removeActivationEventUe(int rnc+| virtual void removeActivationEventUe+
589 -|-
590 Files are identical
591 ********************************
592 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/inc/HashMap.h@@/main/dolphin_inc2.4/0
593 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/inc/HashMap.h
594 ********************************
595 ----------[changed 176-179]------------|----------[changed to 176-180]---------
596 HashMap(const HashMap& other) +| //flexlint 715
597 | HashMap(const HashMap& other);
598 |
599 HashMap& operator=(const HashM+| //flexlint 715
600 -| HashMap& operator=(const HashM+
601 |-
602 ********************************
603 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/inc/PmController.h@@/main/dolphin_inc2.4/0
604 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/inc/PmController.h
605 ********************************
606 --------------[after 45]---------------|------------[inserted 46-48]-----------
607 -|
608 | // Destructor
609 | ~PmController();
610 |-
611 ----------[deleted/moved 78]-----------|-----------[after 80 now 87]-----------
612 Timer *m_timerForFirstScanner; |-
613 -|
614 ----------[deleted/moved 79]-----------|-----------[after 80 now 86]-----------
615 bool m_bIsFirstScanner; |-
616 -|
617 ----------[after 84 was 79]------------|----------[inserted/moved 86]----------
618 -| bool m_bIsFirstScanner;
619 |-
620 ----------[after 84 was 78]------------|----------[inserted/moved 87]----------
621 -| Timer *m_timerForFirstScanner;
622 |-
623 -------------[after 100]---------------|-----------[inserted 104-108]----------
624 -|
625 | // Copy constructor
626 | PmController(const PmController &);
627 | // Assignment operator
628 | PmController & operator=(const PmCon+
629 |-
630 ********************************
631 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/inc/RedirectOutput.h@@/main/dolphin_inc2.4/0
632 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/inc/RedirectOutput.h
633 ********************************
634 -------------[changed 12]--------------|------------[changed to 12]------------
635 RedirectOutput(EventBufferBase *buff+| RedirectOutput(EventBufferBase *_buf+
636 -|-
637 ********************************
638 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/inc/SignalVector.h@@/main/dolphin_inc2.4/0
639 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/inc/SignalVector.h
640 ********************************
641 -------------[changed 46]--------------|------------[changed to 46]------------
642 void operator = (const SignalVect+| void operator = (const SignalVect+
643 -|-
644 ********************************
645 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/inc/StatCollector.h@@/main/dolphin_inc2.4/0
646 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/inc/StatCollector.h
647 ********************************
648 -------------[changed 70]--------------|------------[changed to 70]------------
649 void init(); | void initStatCollector();
650 -|-
651 ********************************
652 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/inc/UetrScanner.h@@/main/dolphin_inc2.4/0
653 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/inc/UetrScanner.h
654 ********************************
655 -----------[deleted 47-48]-------------|---------------[after 46]--------------
656 void addActivationEventUe(int rncMod+|-
657 void removeActivationEventUe(int rnc+|
658 -|
659 ********************************
660 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/AckumulatingCollectorManager.cc@@/main/dolphin_inc2.4/0
661 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/AckumulatingCollectorManager.cc
662 ********************************
663 -------------[changed 28]--------------|------------[changed to 28]------------
664 AckumulatingCollectorManager* Ackumula+| AckumulatingCollectorManager* Ackumula+
665 -|-
666 -----------[changed 30-46]-------------|-----------[changed to 30-46]----------
667 AckumulatingCollectorManager* Ackumula+| AckumulatingCollectorManager* Ackumula+
668 +| +
669 +| +
670 +| +
671 +| +
672 if (!theOneAndOnly) { | if (!theInstance) {
673 theOneAndOnly = new AckumulatingCo+| theInstance = new AckumulatingColl+
674 +| +
675 +| +
676 +| +
677 +| +
678 } | }
679 return theOneAndOnly; | return theInstance;
680 } | }
681 |
682 AckumulatingCollectorManager* Ackumula+| AckumulatingCollectorManager* Ackumula+
683 if (!theOneAndOnly) { | if (!theInstance) {
684 -|-
685 -------------[changed 49]--------------|------------[changed to 49]------------
686 return theOneAndOnly; | return theInstance;
687 -|-
688 -----------[changed 52-56]-------------|-----------[changed to 52-56]----------
689 AckumulatingCollectorManager::Ackumula+| AckumulatingCollectorManager::Ackumula+
690 +| +
691 +| +
692 +| +
693 +| +
694 -|-
695 -----------[changed 58-62]-------------|-----------[changed to 58-62]----------
696 connectionUpwards, | _connectionUpwards,
697 numEventBuffers, | _numEventBuffers,
698 eventBuffers, | _eventBuffers,
699 numCounterEventBuff+| _numCounterEventBuf+
700 counterEventBuffers+| _counterEventBuffer+
701 -|-
702 ********************************
703 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/ActivationChangeTrigger.cc@@/main/dolphin_inc2.4/0
704 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/ActivationChangeTrigger.cc
705 ********************************
706 -------------[deleted 11]--------------|---------------[after 10]--------------
707 #include "roamIfPmEventArraySingleton.+|-
708 -|
709 -----------[changed 19-20]-------------|-----------[changed to 18-19]----------
710 ActivationChangeTrigger::ActivationCha+| ActivationChangeTrigger::ActivationCha+
711 activationChangeObserver(activationC+| activationChangeObserver(_activation+
712 -|-
713 --------------[after 36]---------------|-------------[inserted 36]-------------
714 -| activationChangeObserver = NULL;
715 |-
716 -------------[changed 39]--------------|------------[changed to 39]------------
717 ActivationChangeTrigger* ActivationCha+| ActivationChangeTrigger* ActivationCha+
718 -|-
719 -------------[changed 43]--------------|------------[changed to 43]------------
720 theOneAndOnly = new ActivationChan+| theOneAndOnly = new ActivationChan+
721 -|-
722 ********************************
723 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/CellFilter.cc@@/main/dolphin_inc2.4/0
724 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/CellFilter.cc
725 ********************************
726 ------------[deleted 6-7]--------------|---------------[after 5]---------------
727 #include "roamIfPmController.h" |-
728 #include "RlibIfPmStrmap.h" |
729 -|
730 -------------[changed 39]--------------|------------[changed to 37]------------
731 CellFilter::CellFilter(const int noOfC+| CellFilter::CellFilter(const int _noOf+
732 -|-
733 -------------[changed 41]--------------|------------[changed to 39]------------
734 noOfCells(noOfCells) | noOfCells(_noOfCells)
735 -|-
736 -----------[changed 44-45]-------------|-----------[changed to 42-43]----------
737 cells = new FilterDescriptor::CellId+| cells = new FilterDescriptor::CellId+
738 for (int i=0; i<noOfCells; ++i) | for (int i=0; i<_noOfCells; ++i)
739 -|-
740 -------------[changed 49]--------------|------------[changed to 47]------------
741 qsort(cells, noOfCells, sizeof(cells+| qsort(cells, _noOfCells, sizeof(cell+
742 -|-
743 -------------[changed 54]--------------|------------[changed to 52]------------
744 for (int i=0; i<noOfCells; ++i) | for (int i=0; i<_noOfCells; ++i)
745 -|-
746 -------------[changed 57]--------------|------------[changed to 55]------------
747 if (++count == 20 || i == noOfCell+| if (++count == 20 || i == _noOfCel+
748 -|-
749 ********************************
750 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/Collector.cc@@/main/dolphin_inc2.4/0
751 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/Collector.cc
752 ********************************
753 -------------[changed 25]--------------|------------[changed to 25]------------
754 Collector:: Collector(Output* output) +| Collector:: Collector(Output* _output)+
755 -|-
756 -------------[changed 65]--------------|------------[changed to 65]------------
757 void Collector::addOutput(Output* out+| void Collector::addOutput(Output* _ou+
758 -|-
759 ********************************
760 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/CollectorManager.cc@@/main/pre_dolphin_3.1/dolphin_inc2.4/0
761 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/CollectorManager.cc
762 ********************************
763 -------------[deleted 25]--------------|---------------[after 24]--------------
764 #include "Encoder.h" |-
765 -|
766 -----------[changed 41-52]-------------|-----------[changed to 40-51]----------
767 CollectorManager::CollectorManager(Con+| CollectorManager::CollectorManager(Con+
768 Con+| Con+
769 int+| int+
770 Eve+| Eve+
771 int+| int+
772 Cou+| Cou+
773 : controllerLocation(controllerLocat+| : controllerLocation(_controllerLoca+
774 , connectionUpwards(connectionUpward+| , connectionUpwards(_connectionUpwar+
775 , numEventBuffers(numEventBuffers) | , numEventBuffers(_numEventBuffers)
776 , eventBuffers(eventBuffers) | , eventBuffers(_eventBuffers)
777 , numCounterEventBuffers(numCounterE+| , numCounterEventBuffers(_numCounter+
778 , counterEventBuffers(counterEventBu+| , counterEventBuffers(_counterEventB+
779 -|-
780 -------------[changed 59]--------------|------------[changed to 58]------------
781 if (controllerLocation == onModMp) { | if (_controllerLocation == onModMp) +
782 -|-
783 -------------[changed 63]--------------|------------[changed to 62]------------
784 noOfEventCollectors = numEventBuff+| noOfEventCollectors = _numEventBuf+
785 -|-
786 -------------[changed 75]--------------|------------[changed to 74]------------
787 StatCollector::setControllerLocation+| StatCollector::setControllerLocation+
788 -|-
789 -------------[changed 81]--------------|------------[changed to 80]------------
790 RLIB_ASSERT(noOfEventCollectors <= n+| RLIB_ASSERT(noOfEventCollectors <= _+
791 -|-
792 -------------[changed 87]--------------|------------[changed to 86]------------
793 if (controllerLocation == onModMp) { | if (_controllerLocation == onModMp) +
794 -|-
795 -------------[changed 91]--------------|------------[changed to 90]------------
796 +| +
797 -|-
798 ----------[changed 100-102]------------|----------[changed to 99-101]----------
799 eventBuffers[1]->setDestination(co+| _eventBuffers[1]->setDestination(_+
800 eventBuffers[1]->setSenderModOm(tr+| _eventBuffers[1]->setSenderModOm(t+
801 eventCollectorList[1]->addOutput(n+| eventCollectorList[1]->addOutput(n+
802 -|-
803 ----------[changed 104-105]------------|----------[changed to 103-104]---------
804 counterEventBuffers[0]->setDestina+| _counterEventBuffers[0]->setDestin+
805 statCollectorList[0]->addOutput(ne+| statCollectorList[0]->addOutput(ne+
806 -|-
807 ------------[changed 119]--------------|------------[changed to 118]-----------
808 +| +
809 -|-
810 ------------[changed 130]--------------|------------[changed to 129]-----------
811 statCollectorList[i]->addOutput(+| statCollectorList[i]->addOutput(+
812 -|-
813 -------------[after 141]---------------|-----------[inserted 141-145]----------
814 -| config = 0;
815 | connectionUpwards = 0;
816 | counterEventBuffers = 0;
817 | eventBuffers = 0;
818 |
819 |-
820 ----------[changed 178-192]------------|----------[changed to 182-196]---------
821 CollectorManager* CollectorManager::+| CollectorManager* CollectorManager::+
822 +| +
823 +| +
824 +| +
825 +| +
826 +| +
827 if (!theOneAndOnly[controllerLocatio+| if (!theOneAndOnly[_controllerLocati+
828 theOneAndOnly[controllerLocation] +| theOneAndOnly[_controllerLocation]+
829 +| +
830 +| +
831 +| +
832 +| +
833 +| +
834 } | }
835 return theOneAndOnly[controllerLocat+| return theOneAndOnly[_controllerLoca+
836 -|-
837 ********************************
838 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/CtrScanner.cc@@/main/dolphin_inc2.4/0
839 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/CtrScanner.cc
840 ********************************
841 -------------[deleted 5]---------------|---------------[after 4]---------------
842 #include "roamIfPmController.h" |-
843 -|
844 -------------[changed 39]--------------|------------[changed to 38]------------
845 CtrScanner::CtrScanner(int scannerId, +| CtrScanner::CtrScanner(int _scannerId,+
846 -|-
847 -------------[changed 41]--------------|------------[changed to 40]------------
848 int filterLengt+| int _filterLeng+
849 -|-
850 -----------[changed 43-44]-------------|-----------[changed to 42-43]----------
851 EventScanner(scannerId, scannerType,+| EventScanner(_scannerId, _scannerTyp+
852 filterLength, filterBuf+| _filterLength, filterBu+
853 -|-
854 ------------[changed 112]--------------|------------[changed to 111]-----------
855 void CtrScanner::modifyFilter(int filt+| void CtrScanner::modifyFilter(int _fil+
856 -|-
857 ------------[changed 115]--------------|------------[changed to 114]-----------
858 SUPER::modifyFilter(filterLength, fi+| SUPER::modifyFilter(_filterLength, f+
859 -|-
860 ------------[changed 122]--------------|------------[changed to 121]-----------
861 getAddedOrRemovedUe(ueActiveList, +| getAddedOrRemovedUe_ctr(ueActiveLi+
862 -|-
863 ------------[changed 169]--------------|------------[changed to 168]-----------
864 void CtrScanner::extractActivationEven+| void CtrScanner::extractActivationEven+
865 -|-
866 ------------[changed 182]--------------|------------[changed to 181]-----------
867 Observation* observationList = (Obse+| Observation* _observationList = (Obs+
868 -|-
869 ------------[changed 186]--------------|------------[changed to 185]-----------
870 if (observationList[i].activationL+| if (_observationList[i].activation+
871 -|-
872 ------------[changed 188]--------------|------------[changed to 187]-----------
873 destList[destLength++] = observa+| destList[destLength++] = _observ+
874 -|-
875 ------------[changed 204]--------------|------------[changed to 203]-----------
876 int CtrScanner::getAddedOrRemovedUe(in+| int CtrScanner::getAddedOrRemovedUe_ct+
877 -|-
878 ------------[changed 241]--------------|------------[changed to 240]-----------
879 bool match = false; | bool _match = false;
880 -|-
881 ------------[changed 246]--------------|------------[changed to 245]-----------
882 match = true; | _match = true;
883 -|-
884 ------------[changed 250]--------------|------------[changed to 249]-----------
885 if (!match) | if (!_match)
886 -|-
887 ********************************
888 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/EventCollector.cc@@/main/dolphin_inc2.4/0
889 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/EventCollector.cc
890 ********************************
891 -------------[changed 30]--------------|------------[changed to 30]------------
892 init(); | initEventCollector();
893 -|-
894 -------------[changed 33]--------------|------------[changed to 33]------------
895 EventCollector:: EventCollector(Output+| EventCollector:: EventCollector(Output+
896 -|-
897 -------------[changed 35]--------------|------------[changed to 35]------------
898 init(); | initEventCollector();
899 -|-
900 -------------[changed 47]--------------|------------[changed to 47]------------
901 void EventCollector::init() | void EventCollector::initEventCollecto+
902 -|-
903 ********************************
904 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/EventEncoder.cc@@/main/dolphin_inc2.4/0
905 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/EventEncoder.cc
906 ********************************
907 --------------[after 22]---------------|-------------[inserted 23]-------------
908 -| buffer = 0;
909 |-
910 ********************************
911 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/EventScanner.cc@@/main/dolphin_inc2.4/0
912 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/EventScanner.cc
913 ********************************
914 ------------[deleted 9-11]-------------|---------------[after 8]---------------
915 #include "RlibIfPmStrmap.h" |-
916 #include "roamIfPmEvents.h" |
917 #include "roamIfPmEventArraySingleton.+|
918 -|
919 -----------[changed 20-21]-------------|-----------[changed to 17-18]----------
920 EventScanner::EventScanner(const int s+| EventScanner::EventScanner(const int _+
921 const int s+| const int _+
922 -|-
923 -------------[changed 24]--------------|------------[changed to 21]------------
924 const int f+| const int _+
925 -|-
926 -------------[changed 28]--------------|------------[changed to 25]------------
927 Scanner(scannerId, scannerType, obsL+| Scanner(_scannerId, _scannerType, ob+
928 -|-
929 -------------[changed 31]--------------|------------[changed to 28]------------
930 PM_SCANNER_TRACE_OBJ(scannerId, | PM_SCANNER_TRACE_OBJ(_scannerId,
931 -|-
932 -------------[changed 36]--------------|------------[changed to 33]------------
933 scannerId, +| _scannerId,+
934 -|-
935 -----------[changed 40-42]-------------|-----------[changed to 37-39]----------
936 this->filterLength = filterLength; | this->filterLength = _filterLength;
937 filterList = new int[filterLength]; | filterList = new int[_filterLength];
938 memcpy(filterList, filterBuffer, fil+| memcpy(filterList, filterBuffer, _fi+
939 -|-
940 -----------[changed 82-84]-------------|-----------[changed to 79-83]----------
941 } | if(filterList)
942 | delete[] filterList;
943 void EventScanner::modifyFilter(int fi+| }
944 -|
945 | void EventScanner::modifyFilter(int _f+
946 |-
947 -------------[changed 88]--------------|------------[changed to 87]------------
948 this->filterLength = filterLength; | this->filterLength = _filterLength; +
949 -|-
950 -----------[changed 90-91]-------------|-----------[changed to 89-90]----------
951 filterList = new int[filterLength]; | filterList = new int[_filterLength];
952 memcpy(filterList, filterBuffer, fil+| memcpy(filterList, filterBuffer, _fi+
953 -|-
954 -------------[changed 99]--------------|------------[changed to 98]------------
955 Observation* observationList = (Obse+| Observation* obsList = (Observation*+
956 -|-
957 ------------[changed 103]--------------|------------[changed to 102]-----------
958 if (observationList[i].activationL+| if (obsList[i].activationLevel == +
959 -|-
960 ------------[changed 105]--------------|------------[changed to 104]-----------
961 destList[destLength++] = observa+| destList[destLength++] = obsList+
962 -|-
963 ********************************
964 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/FileOutput.cc@@/main/dolphin_inc2.4/0
965 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/FileOutput.cc
966 ********************************
967 -------------[changed 10]--------------|------------[changed to 10]------------
968 FileOutput::FileOutput(Encoder *encode+| FileOutput::FileOutput(Encoder *_encod+
969 -|-
970 -------------[changed 12]--------------|------------[changed to 12]------------
971 EventBufferBase+| EventBufferBase+
972 -|-
973 -----------[changed 18-19]-------------|-----------[changed to 18-19]----------
974 OSTIME timeslic+| OSTIME timeslic+
975 fileWritingProcess = new FileWriting+| fileWritingProcess = new FileWriting+
976 -|-
977 -------------[changed 29]--------------|------------[changed to 29]------------
978 buffer->setDestination(fileWritingPr+| _buffer->setDestination(fileWritingP+
979 -|-
980 ********************************
981 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/FileWritingProcess.cc@@/main/dolphin_inc2.4/1
982 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/FileWritingProcess.cc
983 ********************************
984 -----------[changed 32-33]-------------|-----------[changed to 32-33]----------
985 FileWritingProcess::FileWritingProcess+| FileWritingProcess::FileWritingProcess+
986 +| +
987 -|-
988 -----------[changed 40-41]-------------|-----------[changed to 40-41]----------
989 encoder(encoder), | encoder(_encoder),
990 scannerType(scannerType), | scannerType(_scannerType),
991 -|-
992 --------------[after 54]---------------|------------[inserted 55-69]-----------
993 -| encoder = 0;
994 | configuration = 0;
995 | if(ropFile != 0){
996 | fclose(ropFile);
997 | }
998 | ropFile = 0;
999 | if(ropFileName != 0){
1000 | delete[] ropFileName;
1001 | }
1002 | ropFileName = 0;
1003 | if(zipFile != 0){
1004 | gzclose(zipFile);
1005 | }
1006 | zipFile = 0;
1007 |
1008 |-
1009 ------------[changed 143]--------------|------------[changed to 158]-----------
1010 case EventBufferSignal::eventBufferS+| case EventBufferSignal::eventBufferS+
1011 -|-
1012 ------------[changed 486]--------------|------------[changed to 501]-----------
1013 void FileWritingProcess::writeFooterTo+| void FileWritingProcess::writeFooterTo+
1014 -|-
1015 ------------[changed 496]--------------|------------[changed to 511]-----------
1016 Scanner+| Scanner+
1017 -|-
1018 ------------[changed 520]--------------|------------[changed to 535]-----------
1019 writeBufferToFile(footer, footerReco+| writeBufferToFile(footer, footerReco+
1020 -|-
1021 ------------[changed 524]--------------|------------[changed to 539]-----------
1022 Scanner+| Scanner+
1023 -|-
1024 ------------[changed 532]--------------|------------[changed to 547]-----------
1025 +| +
1026 -|-
1027 ------------[changed 541]--------------|------------[changed to 556]-----------
1028 Scanner+| Scanner+
1029 -|-
1030 ------------[changed 572]--------------|------------[changed to 587]-----------
1031 writeBufferToFile(buffer, connection+| writeBufferToFile(buffer, connection+
1032 -|-
1033 ------------[changed 576]--------------|------------[changed to 591]-----------
1034 writeFooterToFile(scannerType, fil+| writeFooterToFile(_scannerType, fi+
1035 -|-
1036 ------------[changed 583]--------------|------------[changed to 598]-----------
1037 +| +
1038 -|-
1039 ------------[changed 590]--------------|------------[changed to 605]-----------
1040 Scanner+| Scanner+
1041 -|-
1042 ********************************
1043 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/GpehScanner.cc@@/main/dolphin_inc2.4/0
1044 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/GpehScanner.cc
1045 ********************************
1046 -------------[deleted 4]---------------|---------------[after 3]---------------
1047 #include "roamIfPmController.h" |-
1048 -|
1049 -------------[changed 30]--------------|------------[changed to 29]------------
1050 GpehScanner::GpehScanner(int scannerId+| GpehScanner::GpehScanner(int _scannerI+
1051 -|-
1052 -------------[changed 32]--------------|------------[changed to 31]------------
1053 int filterLength, int* f+| int _filterLength, int* +
1054 -|-
1055 -----------[changed 34-35]-------------|-----------[changed to 33-34]----------
1056 EventScanner(scannerId, scannerType,+| EventScanner(_scannerId, _scannerTyp+
1057 filterLength, filterBuf+| _filterLength, filterBu+
1058 -|-
1059 --------------[after 36]---------------|------------[inserted 36-37]-----------
1060 -|
1061 | registerObservationList = (int *)0;
1062 |-
1063 -------------[changed 38]--------------|------------[changed to 39]------------
1064 if (controllerLocation == onOmMp && +| if (controllerLocation == onOmMp && +
1065 -|-
1066 -------------[changed 77]--------------|-----------[changed to 78-80]----------
1067 | }
1068 -|
1069 | if(registerObservationList != 0){
1070 |-
1071 -------------[deleted 82]--------------|---------------[after 84]--------------
1072 |-
1073 -|
1074 ********************************
1075 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/MemoryAllocator.cc@@/main/dolphin_inc2.4/0
1076 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/MemoryAllocator.cc
1077 ********************************
1078 --------------[after 10]---------------|-------------[inserted 11]-------------
1079 -| nextFree = 0;
1080 |-
1081 ********************************
1082 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/ObservationFilter.cc@@/main/dolphin_inc2.4/0
1083 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/ObservationFilter.cc
1084 ********************************
1085 -------------[deleted 3]---------------|---------------[after 2]---------------
1086 #include "roamIfPmController.h" |-
1087 -|
1088 ********************************
1089 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/Output.cc@@/main/dolphin_inc2.4/0
1090 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/Output.cc
1091 ********************************
1092 ------------[changed 3-5]--------------|------------[changed to 3-5]-----------
1093 Output::Output(Encoder *encoder, | Output::Output(Encoder *_encoder,
1094 EventBufferBase *buffer+| EventBufferBase *_buffe+
1095 : buffer(buffer), encoder(encoder) { | : buffer(_buffer), encoder(_encoder)+
1096 -|-
1097 --------------[after 8]----------------|------------[inserted 9-11]------------
1098 -| buffer = 0;
1099 | encoder = 0;
1100 |
1101 |-
1102 ********************************
1103 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/PmAppOutput.cc@@/main/dolphin_inc2.4/0
1104 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/PmAppOutput.cc
1105 ********************************
1106 -------------[changed 7]---------------|-------------[changed to 7]------------
1107 PmAppOutput::PmAppOutput(Connection *c+| PmAppOutput::PmAppOutput(Connection *_+
1108 -|-
1109 -------------[changed 9]---------------|-------------[changed to 9]------------
1110 connection(connection), | connection(_connection),
1111 -|-
1112 --------------[after 15]---------------|------------[inserted 16-22]-----------
1113 -| if(buf != 0){
1114 | Platform::free_buf(&buf);
1115 | buf = 0;
1116 | }
1117 | counterBuffer = 0;
1118 | connection = 0;
1119 |
1120 |-
1121 -------------[changed 59]--------------|------------[changed to 66]------------
1122 int *counterBuffer = (int *) &buf->r+| int *_counterBuffer = (int *) &buf->+
1123 -|-
1124 -----------[changed 61-63]-------------|-----------[changed to 68-70]----------
1125 int counterId = *counterBu+| int counterId = *_counterB+
1126 int counterInstanceId = *counterBu+| int counterInstanceId = *_counterB+
1127 int value = *counterBu+| int value = *_counterB+
1128 -|-
1129 ********************************
1130 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/PmController.cc@@/main/pre_dolphin_3.1/dolphin_inc2.4/1
1131 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/PmController.cc
1132 ********************************
1133 -------------[deleted 28]--------------|---------------[after 27]--------------
1134 #include "rlibRncConst.h" |-
1135 -|
1136 -----------[deleted 52-53]-------------|---------------[after 50]--------------
1137 #include "roamIfPmEvents.h" |-
1138 #include "RlibIfPmStrmap.h" |
1139 -|
1140 -------------[changed 71]--------------|------------[changed to 68]------------
1141 PmController::PmController(ControllerL+| PmController::PmController(ControllerL+
1142 -|-
1143 -----------[changed 73-78]-------------|-----------[changed to 70-75]----------
1144 int numConn+| int _numCon+
1145 Connection +| Connection +
1146 int numEven+| int _numEve+
1147 EventBuffer+| EventBuffer+
1148 int numCoun+| int _numCou+
1149 CounterEven+| CounterEven+
1150 -|-
1151 -------------[changed 80]--------------|------------[changed to 77]------------
1152 char *name,+| char *_name+
1153 -|-
1154 -------------[changed 82]--------------|------------[changed to 79]------------
1155 OSPRIORITY +| OSPRIORITY +
1156 -|-
1157 -------------[changed 86]--------------|------------[changed to 83]------------
1158 ConnectedProcess(proc_type,name,stac+| ConnectedProcess(proc_type,_name,sta+
1159 -|-
1160 -----------[changed 90-96]-------------|-----------[changed to 87-93]----------
1161 controllerLocation(controllerLocatio+| controllerLocation(_controllerLocati+
1162 priority(priority) , | priority(_priority) ,
1163 numConnectionDownwards(numConnection+| numConnectionDownwards(_numConnectio+
1164 numEventBuffers(numEventBuffers), | numEventBuffers(_numEventBuffers),
1165 numCounterEventBuffers(numCounterEve+| numCounterEventBuffers(_numCounterEv+
1166 eventBuffers(eventBuffers), | eventBuffers(_eventBuffers),
1167 counterEventBuffers(counterEventBuff+| counterEventBuffers(_counterEventBuf+
1168 -|-
1169 ------------[changed 100]--------------|------------[changed to 97]------------
1170 LoadModuleName::set(controllerLocati+| LoadModuleName::set(_controllerLocat+
1171 -|-
1172 ------------[changed 109]--------------|------------[changed to 106]-----------
1173 this->connectionDownwards = connecti+| this->connectionDownwards = _connect+
1174 -|-
1175 ----------[changed 113-115]------------|----------[changed to 110-112]---------
1176 for (int i = 0; i < numConnectionDow+| for (int i = 0; i < _numConnectionDo+
1177 if (connectionDownwards[i]) { | if (_connectionDownwards[i]) {
1178 add(*connectionDownwards[i]); | add(*_connectionDownwards[i]);
1179 -|-
1180 ----------[changed 119-120]------------|----------[changed to 116-117]---------
1181 if (controllerLocation == onModMp) { | if (_controllerLocation == onModMp) +
1182 collectorManager = CollectorManage+| collectorManager = CollectorManage+
1183 -|-
1184 ----------[changed 122-125]------------|----------[changed to 119-122]---------
1185 +| +
1186 +| +
1187 +| +
1188 +| +
1189 -|-
1190 ----------[changed 131-138]------------|----------[changed to 128-152]---------
1191 collectorManager = AckumulatingCol+| collectorManager = AckumulatingCol+
1192 +| +
1193 +| +
1194 +| +
1195 +| +
1196 } | }
1197 |
1198 } | }
1199 -|
1200 | PmController::~PmController() {
1201 | delete signalQueue;
1202 |
1203 | collectorManager = 0;
1204 | configuration = 0;
1205 | connectionDownwards = 0;
1206 | counterEventBuffers = 0;
1207 | eventBuffers = 0;
1208 | timer = 0;
1209 | if(ueIndScannerIdList != 0)
1210 | delete ueIndScannerIdList;
1211 | ueIndScannerIdList = 0;
1212 | m_timerForFirstScanner = 0;
1213 |
1214 | }
1215 |
1216 |-
1217 ------------[changed 164]--------------|------------[changed to 178]-----------
1218 void PmController::traceSend(union SIG+| void PmController::traceSend(union SIG+
1219 -|-
1220 ------------[changed 169]--------------|------------[changed to 183]-----------
1221 sigInstance->traceSend(sigInstance+| sigInstance->traceSend(sigInstance+
1222 -|-
1223 ------------[changed 171]--------------|------------[changed to 185]-----------
1224 TRACE_OBJ_BUS_SEND(PM_OBS, strSend+| TRACE_OBJ_BUS_SEND(PM_OBS, strSend+
1225 -|-
1226 ----------[changed 176-179]------------|----------[changed to 190-193]---------
1227 void PmController::sendSignal(Signal *+| void PmController::sendSignal(Signal *+
1228 int index = getIndex(name); | int _index = getIndex(_name);
1229 RLIB_ASSERT (index >= 0); | RLIB_ASSERT (_index >= 0);
1230 Connection *connection = connArray[i+| Connection *connection = connArray[_+
1231 -|-
1232 ----------[changed 185-186]------------|----------[changed to 199-200]---------
1233 bool remove = rncModuleId == -1 && u+| bool _remove = rncModuleId == -1 && +
1234 if (!remove) { | if (!_remove) {
1235 -|-
1236 ------------[changed 238]--------------|------------[changed to 252]-----------
1237 void PmController::replyWith(Signal &s+| void PmController::replyWith(Signal &s+
1238 -|-
1239 ----------[changed 240-241]------------|----------[changed to 254-255]---------
1240 traceSend(signalToSend.buf, pid); | traceSend(signalToSend.buf, _pid);
1241 signalToSend.send(pid); | signalToSend.send(_pid);
1242 -|-
1243 ------------[changed 247]--------------|------------[changed to 261]-----------
1244 case EventBufferSignal::eventBufferS+| case EventBufferSignal::eventBufferS+
1245 -|-
1246 ----------[changed 256-257]------------|----------[changed to 270-271]---------
1247 TRACE(8, STR("flushTimeoutSi+| TRACE(8, STR("flushT+
1248 processFlushTimeoutSignal(re+| processFlushTimeoutS+
1249 -|-
1250 ------------[changed 268]--------------|------------[changed to 282]-----------
1251 break; | break;
1252 -|-
1253 ------------[changed 485]--------------|------------[changed to 499]-----------
1254 PROCESS pid = Platform::sender(&+| PROCESS _pid = Platform::sender(+
1255 -|-
1256 ------------[changed 489]--------------|------------[changed to 503]-----------
1257 const int &pidIndex = getIndex(p+| const int &pidIndex = getIndex(_+
1258 -|-
1259 ------------[changed 492]--------------|------------[changed to 506]-----------
1260 connArray[pidIndex]->setMpId(p+| connArray[pidIndex]->setMpId(_+
1261 -|-
1262 ------------[changed 499]--------------|------------[changed to 513]-----------
1263 LoadModuleName:+| LoadModuleName:+
1264 -|-
1265 ------------[changed 505]--------------|------------[changed to 519]-----------
1266 PROCESS pid = Platform::sender(&+| PROCESS _pid = Platform::sender(+
1267 -|-
1268 ----------[changed 508-509]------------|----------[changed to 522-523]---------
1269 L+| L+
1270 ModuleIdResponseSignal(moduleId)+| ModuleIdResponseSignal(moduleId)+
1271 -|-
1272 ------------[changed 650]--------------|------------[changed to 664]-----------
1273 indexForLastSlash = i; | indexForLastSlash = i+1; // one +
1274 -|-
1275 ------------[changed 662]--------------|------------[changed to 676]-----------
1276 linkHandlerName[indexForLastSlash + +| linkHandlerName[indexForLastSlash] =+
1277 -|-
1278 ------------[changed 698]--------------|------------[changed to 712]-----------
1279 void PmController::connectionUp(int in+| void PmController::connectionUp(int _i+
1280 -|-
1281 ----------[changed 703-704]------------|----------[changed to 717-718]---------
1282 index, | _index,
1283 connArray[index]->getName()+| connArray[_index]->getName(+
1284 -|-
1285 ------------[changed 712]--------------|------------[changed to 726]-----------
1286 indexForSubordinateControllerOrAge+| indexForSubordinateControllerOrAge+
1287 -|-
1288 ------------[changed 715]--------------|------------[changed to 729]-----------
1289 indexForSubordinateControllerOrAge+| indexForSubordinateControllerOrAge+
1290 -|-
1291 ------------[changed 724]--------------|------------[changed to 738]-----------
1292 index)); | _index));
1293 -|-
1294 ------------[changed 762]--------------|------------[changed to 776]-----------
1295 if (index == 0) { | if (_index == 0) {
1296 -|-
1297 ------------[changed 769]--------------|------------[changed to 783]-----------
1298 void PmController::connectionDown(int +| void PmController::connectionDown(int +
1299 -|-
1300 ----------[changed 774-775]------------|----------[changed to 788-789]---------
1301 index, | _index,
1302 connArray[index]->getName()+| connArray[_index]->getName(+
1303 -|-
1304 ------------[changed 783]--------------|------------[changed to 797]-----------
1305 indexForSubordinateControllerOrAge+| indexForSubordinateControllerOrAge+
1306 -|-
1307 ------------[changed 786]--------------|------------[changed to 800]-----------
1308 indexForSubordinateControllerOrAge+| indexForSubordinateControllerOrAge+
1309 -|-
1310 ------------[changed 793]--------------|------------[changed to 807]-----------
1311 reportForRestart(connArray[index]-+| reportForRestart(connArray[_index]+
1312 -|-
1313 ------------[changed 806]--------------|------------[changed to 820]-----------
1314 if(index == 0) collectorManager->st+| if(_index == 0) collectorManager->s+
1315 -|-
1316 ********************************
1317 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/Scanner.cc@@/main/dolphin_inc2.4/0
1318 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/Scanner.cc
1319 ********************************
1320 -----------[changed 13-14]-------------|-----------[changed to 13-14]----------
1321 Scanner::Scanner(const int scannerId, | Scanner::Scanner(const int _scannerId,
1322 const int scannerType+| const int _scannerTyp+
1323 -|-
1324 -----------[changed 18-19]-------------|-----------[changed to 18-19]----------
1325 scannerId(scannerId ), | scannerId(_scannerId ),
1326 scannerType(scannerType), | scannerType(_scannerType),
1327 -|-
1328 -----------[changed 32-33]-------------|-----------[changed to 32-33]----------
1329 char *Scanner::getScannerName(int scan+| char *Scanner::getScannerName(int _sca+
1330 switch(scannerType) { | switch(_scannerType) {
1331 -|-
1332 ********************************
1333 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/ScannerIdSet.cc@@/main/dolphin_inc2.4/0
1334 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/ScannerIdSet.cc
1335 ********************************
1336 ------------[changed 6-8]--------------|------------[changed to 6-8]-----------
1337 ScannerIdSet::ScannerIdSet(int maxNumS+| ScannerIdSet::ScannerIdSet(int _maxNum+
1338 : maxNumScannerIds(maxNumScannerIds), +| : maxNumScannerIds(_maxNumScannerIds),+
1339 scannerIds = new int [maxNumScannerI+| scannerIds = new int [_maxNumScanner+
1340 -|-
1341 ********************************
1342 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/StatCollector.cc@@/main/pre_dolphin_3.1/dolphin_inc2.4/0
1343 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/StatCollector.cc
1344 ********************************
1345 ------------[changed 122]--------------|------------[changed to 122]-----------
1346 AckumulatingCollectorManager *coll+| AckumulatingCollectorManager *coll+
1347 -|-
1348 ------------[changed 181]--------------|------------[changed to 181]-----------
1349 AckumulatingCollectorManager *coll+| AckumulatingCollectorManager *coll+
1350 -|-
1351 ------------[changed 456]--------------|------------[changed to 456]-----------
1352 init(); | initStatCollector();
1353 -|-
1354 ----------[changed 459-460]------------|----------[changed to 459-460]---------
1355 StatCollector::StatCollector(Output* o+| StatCollector::StatCollector(Output* _+
1356 init(); | initStatCollector();
1357 -|-
1358 ------------[changed 470]--------------|------------[changed to 470]-----------
1359 void StatCollector::init(){ | void StatCollector::initStatCollector(+
1360 -|-
1361 ********************************
1362 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/StatScanner.cc@@/main/dolphin_inc2.4/0
1363 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/StatScanner.cc
1364 ********************************
1365 -----------[changed 14-15]-------------|-----------[changed to 14-15]----------
1366 StatScanner::StatScanner(const int sca+| StatScanner::StatScanner(const int _sc+
1367 const int scannerType+| const int _scannerTyp+
1368 -|-
1369 -----------[changed 20-21]-------------|-----------[changed to 20-21]----------
1370 Scanner(scannerId, | Scanner(_scannerId,
1371 scannerType, | _scannerType,
1372 -|-
1373 -------------[changed 34]--------------|------------[changed to 34]------------
1374 scannerId, | _scannerId,
1375 -|-
1376 ********************************
1377 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/SubordinateStatus.cc@@/main/dolphin_inc2.4/0
1378 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/SubordinateStatus.cc
1379 ********************************
1380 ------------[changed 5-8]--------------|------------[changed to 5-8]-----------
1381 SubordinateStatus::SubordinateStatus(i+| SubordinateStatus::SubordinateStatus(i+
1382 maxNumSubordinate(maxNumSubordinate)+| maxNumSubordinate(_maxNumSubordinate+
1383 subordinate(new SubordinateInfo [max+| subordinate(new SubordinateInfo [_ma+
1384 pending(new PendingInfo [2 * maxNumS+| pending(new PendingInfo [2 * _maxNum+
1385 -|-
1386 -----------[changed 12-13]-------------|-----------[changed to 12-13]----------
1387 pendingMaxSize(2 * maxNumSubordinate+| pendingMaxSize(2 * _maxNumSubordinat+
1388 for (int i = 0; i < maxNumSubordinat+| for (int i = 0; i < _maxNumSubordina+
1389 -|-
1390 ********************************
1391 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/UeActivationList.cc@@/main/dolphin_inc2.4/0
1392 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/UeActivationList.cc
1393 ********************************
1394 -------------[deleted 22]--------------|---------------[after 21]--------------
1395 tail = NULL; |-
1396 -|
1397 --------------[after 23]---------------|-------------[inserted 23]-------------
1398 -| tail = NULL;
1399 |-
1400 ********************************
1401 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/UeFilter.cc@@/main/dolphin_inc2.4/0
1402 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/UeFilter.cc
1403 ********************************
1404 ------------[deleted 4-5]--------------|---------------[after 3]---------------
1405 #include "roamIfPmController.h" |-
1406 #include "RlibIfPmStrmap.h" |
1407 -|
1408 -------------[changed 13]--------------|------------[changed to 11]------------
1409 UeFilter::UeFilter(const int noOfUes, | UeFilter::UeFilter(const int _noOfUes,
1410 -|-
1411 -------------[changed 15]--------------|------------[changed to 13]------------
1412 noOfUes(noOfUes) | noOfUes(_noOfUes)
1413 -|-
1414 ********************************
1415 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/UeIndScannerIdList.cc@@/main/dolphin_inc2.4/0
1416 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/UeIndScannerIdList.cc
1417 ********************************
1418 -------------[deleted 22]--------------|---------------[after 21]--------------
1419 tail = NULL; |-
1420 -|
1421 --------------[after 23]---------------|-------------[inserted 23]-------------
1422 -| tail = NULL;
1423 |-
1424 ********************************
1425 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/UetrScanner.cc@@/main/dolphin_inc2.4/0
1426 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/UetrScanner.cc
1427 ********************************
1428 -------------[deleted 4]---------------|---------------[after 3]---------------
1429 #include "roamIfPmController.h" |-
1430 -|
1431 -------------[changed 28]--------------|------------[changed to 27]------------
1432 UetrScanner::UetrScanner(int scannerId+| UetrScanner::UetrScanner(int _scannerI+
1433 -|-
1434 -------------[changed 30]--------------|------------[changed to 29]------------
1435 int filterLen+| int _filterLe+
1436 -|-
1437 -----------[changed 32-33]-------------|-----------[changed to 31-32]----------
1438 EventScanner(scannerId, scannerType,+| EventScanner(_scannerId, _scannerTyp+
1439 filterLength, filterBuf+| _filterLength, filterBu+
1440 -|-
1441 -------------[changed 73]--------------|------------[changed to 72]------------
1442 void UetrScanner::modifyFilter(int fil+| void UetrScanner::modifyFilter(int _fi+
1443 -|-
1444 -------------[changed 76]--------------|------------[changed to 75]------------
1445 SUPER::modifyFilter(filterLength, fi+| SUPER::modifyFilter(_filterLength, f+
1446 -|-
1447 ********************************
1448 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerBlU/external/src/roamIfPmAsn1Encoder.cc@@/main/dolphin_inc2.4/0
1449 >>> file 2: ./roamPmControllerBl/roamPmControllerBlU/external/src/roamIfPmAsn1Encoder.cc
1450 ********************************
1451 --------------[after 50]---------------|------------[inserted 51-52]-----------
1452 -|
1453 | TRACE(2, STR("OssGlobal = %d", (int)+
1454 |-
1455 --------------[after 57]---------------|-------------[inserted 60]-------------
1456 -| TRACE(2, STR("OssGlobal = %d", (int)+
1457 |-
1458 --------------[after 62]---------------|-------------[inserted 66]-------------
1459 -| TRACE(2, STR("OssGlobal = %d, buf= %+
1460 |-
1461 --------------[after 87]---------------|-------------[inserted 92]-------------
1462 -| world = 0;
1463 |-
1464 ********************************
1465 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerTest/external/src/PmApplicationStub.cc@@/main/dolphin_inc2.4/0
1466 >>> file 2: ./roamPmControllerBl/roamPmControllerTest/external/src/PmApplicationStub.cc
1467 ********************************
1468 ------------[changed 5-6]--------------|-------------[changed to 5]------------
1469 #include <iostream.h> |
1470 #include <fstream.h> |-
1471 -|
1472 ********************************
1473 <<< file 1: /vobs/rnc/tdscdma/dev5/rlibSs/roamPmControllerBl/roamPmControllerTest/external/src/UeRegStub.cc@@/main/dolphin_inc2.4/0
1474 >>> file 2: ./roamPmControllerBl/roamPmControllerTest/external/src/UeRegStub.cc
1475 ********************************
1476 -------------[changed 30]--------------|------------[changed to 30]------------
1477 UeRegStub::UeRegStub(Connection *conne+| UeRegStub::UeRegStub(Connection *_conn+
1478 -|-
1479 -----------[changed 38-39]-------------|-----------[changed to 38-39]----------
1480 this->connectionDownwards = connecti+| this->connectionDownwards = _connect+
1481 add(*connectionDownwards); | add(*_connectionDownwards);
1482 -|-
1483 --------------[after 58]---------------|-------------[inserted 59]-------------
1484 -| connectionDownwards = 0;
1485 |-
1486 ----------[changed 160-161]------------|----------[changed to 161-162]---------
1487 void UeRegStub::setModuleId(int setMod+| void UeRegStub::setModuleId(int _setMo+
1488 moduleId = setModuleId; | moduleId = _setModuleId;
1489 -|-
 
  
Legend:
Removed 
Changed
 Added

[Add General Comment] to topic.