sdk/tools/dynamic-analyzer.git
10 years agoFile : changed some values on the details view 54/26954/1
hyeran74.kim [Tue, 2 Sep 2014 07:20:07 +0000 (16:20 +0900)]
File : changed some values on the details view
removed the usage time value
diplay the sum of read/wirte size by thread

Change-Id: Ifb3c82e6684156bf8993cbfc1b92c81cd51aa227
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoFile : deal with if there is no releasing file locked when closing the file 48/26948/1
hyeran74.kim [Tue, 2 Sep 2014 04:51:56 +0000 (13:51 +0900)]
File : deal with if there is no releasing file locked when closing the file

Change-Id: If24fae9fed1bdb5651c062cdfbce7c68e76ac464
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoMerge remote-tracking branch 'origin/tizen' into da-file 95/26895/1
hyeran74.kim [Mon, 1 Sep 2014 03:07:20 +0000 (12:07 +0900)]
Merge remote-tracking branch 'origin/tizen' into da-file

Change-Id: I67919248a5ea47820f86c877fa93fef9f7a559aa
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoSAVE: change saveData caller 84/26884/1
greatim [Sun, 31 Aug 2014 06:51:39 +0000 (15:51 +0900)]
SAVE: change saveData caller

change the timing of calling saveData() to save rest data in summarizing phase.

Change-Id: Ic636f18fba6f91d8fdc697948c6c9b0f2559288d
Signed-off-by: greatim <jaewon81.lim@samsung.com>
10 years agoMISC : version up and modify dependency for kepler build 35/26835/1
jungwook.ryu [Fri, 29 Aug 2014 08:08:29 +0000 (17:08 +0900)]
MISC : version up and modify dependency for kepler build

Change-Id: I803568d169eefdc7719f35540f6db9c6b8e626ca
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoFile : changed the way to get function name 28/26828/1
hyeran74.kim [Fri, 29 Aug 2014 05:25:33 +0000 (14:25 +0900)]
File : changed the way to get function name

Change-Id: I3ec5808e8ca7819fe3aaa87e5ba1b0b8fce9ebfd
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoMerge "Chart : redraw chart when resizing tool" into tizen
juyoung kim [Fri, 29 Aug 2014 01:36:45 +0000 (18:36 -0700)]
Merge "Chart : redraw chart when resizing tool" into tizen

10 years agoCALLTRACE: bug fix - callstack of calltrace is not shown 27/26827/1
woojin [Fri, 29 Aug 2014 01:27:12 +0000 (10:27 +0900)]
CALLTRACE: bug fix - callstack of calltrace is not shown

revert code of tainting data of calltrace table
change index of time column for windowing table(calltrace)

Change-Id: I25ce4fd7123e6185162a0e89a52ce75b3077f5cb
Signed-off-by: woojin <woojin2.jung@samsung.com>
10 years agoChart : redraw chart when resizing tool 26/26826/1
jungwook.ryu [Fri, 29 Aug 2014 01:21:17 +0000 (10:21 +0900)]
Chart : redraw chart when resizing tool

Change-Id: Iaf6ac52259c6ccc155ae04fef1989f3552d79c5d
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoCOMM: bug fix for trace cancel 25/26825/1
greatim [Fri, 29 Aug 2014 00:30:16 +0000 (09:30 +0900)]
COMM: bug fix for trace cancel

When tracing is canceled, Message receive thread still be blocked,
Set the socket timeout time to 5sec, and do not show the disconnect popup when tracing is canceled

Change-Id: I4d5340020e802905d6b35539f7ca84a0029b6456
Signed-off-by: greatim <jaewon81.lim@samsung.com>
10 years agoRange : comment out the function profiling feature in range 24/26824/1
seokgil.kang [Fri, 29 Aug 2014 00:04:31 +0000 (09:04 +0900)]
Range : comment out the function profiling feature in range

Change-Id: Ifa947963e664045c9c66a916cdd4b9c521babbf2
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
10 years agoMerge "Chart : adjust tooltip position (cpu core chart)" into tizen
juyoung kim [Thu, 28 Aug 2014 23:57:29 +0000 (16:57 -0700)]
Merge "Chart : adjust tooltip position (cpu core chart)" into tizen

10 years agoChart : adjust tooltip position (cpu core chart) 23/26823/1
jungwook.ryu [Thu, 28 Aug 2014 23:34:25 +0000 (08:34 +0900)]
Chart : adjust tooltip position (cpu core chart)

Change-Id: I8e99ee19492e98a534181e050f1306629cda0f9a
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoRevision constraint of table for Systemchart 22/26822/1
jungwook.ryu [Thu, 28 Aug 2014 22:51:10 +0000 (07:51 +0900)]
Revision constraint of table for Systemchart

Change-Id: Ieecc5abd5fa71891e2d6e7d0e182c6b8e8dd9ae9
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoINTERNAL: bug fix for source viewing 17/26817/1
greatim [Thu, 28 Aug 2014 17:45:07 +0000 (02:45 +0900)]
INTERNAL: bug fix for source viewing

source viewing bug is fixed, and directory to extract rpms is changed.
EFL app do not launch with launch_pad

Change-Id: I3d4d2137bf2996f9395e346bf3411e0172ab9874
Signed-off-by: greatim <jaewon81.lim@samsung.com>
10 years agoINTERNAL: fix bug when cancel the start tracing 78/26778/1
greatim [Thu, 28 Aug 2014 15:30:58 +0000 (00:30 +0900)]
INTERNAL: fix bug when cancel the start tracing

when cancel the start tracing, timer can be stopped normally

Change-Id: I1daff004a0b51b957850e78a98912daf1bae110d
Signed-off-by: greatim <jaewon81.lim@samsung.com>
10 years agoBUGFIX source link error in the leak view
JuYoung Kim [Thu, 28 Aug 2014 14:40:14 +0000 (23:40 +0900)]
BUGFIX source link error in the leak view

Change-Id: Ide00744714ad541809192ccbd61200410fdf8b18
Signed-off-by: JuYoung Kim <j0.kim@samsung.com>
10 years agoTimeline : bug fix timeline chart redrawing and apply DB to ScreenshotView 31/26731/1
jungwook.ryu [Thu, 28 Aug 2014 11:07:24 +0000 (20:07 +0900)]
Timeline : bug fix timeline chart redrawing and apply DB to ScreenshotView

Change-Id: Ie5a519b0060093004b2cfb38b0f26a13b93d8e14
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agocalltrace - revision query for calltrace table 30/26730/1
jungwook.ryu [Thu, 28 Aug 2014 07:00:13 +0000 (16:00 +0900)]
calltrace - revision query for calltrace table

Change-Id: If52e31b19392aadf0c5c69c723be476da937c922
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoTimeline : set primary key of timline chart table 29/26729/1
jungwook.ryu [Thu, 28 Aug 2014 02:29:07 +0000 (11:29 +0900)]
Timeline : set primary key of timline chart table

Change-Id: Ic1358e4645d46edee734e38b89554d61dd8370d7
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoRange : modify initializing part of the range leak data 28/26728/1
seokgil.kang [Thu, 28 Aug 2014 10:47:36 +0000 (19:47 +0900)]
Range : modify initializing part of the range leak data

Change-Id: I4c55b2e26fb457ecabfd8f6d7e8705d65fb830bd
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
10 years agoSummary : modify not to use the DB Inserter in the leak data save logic (thread timin... 22/26722/1
seokgil.kang [Thu, 28 Aug 2014 09:03:37 +0000 (18:03 +0900)]
Summary : modify not to use the DB Inserter in the leak data save logic (thread timing issue)

Change-Id: I9a18a81972e7dc157ec8d41f6f03263a378f2b2f
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
10 years agoMerge "SAVE: add to save rest of data" into tizen
juyoung kim [Thu, 28 Aug 2014 08:03:04 +0000 (01:03 -0700)]
Merge "SAVE: add to save rest of data" into tizen

10 years agoSummary : add index column setting to the Memory allocation / free DB table and apply... 13/26713/1
seokgil.kang [Thu, 28 Aug 2014 07:28:52 +0000 (16:28 +0900)]
Summary : add index column setting to the Memory allocation / free DB table and apply enumeration to the db index/column definition

Change-Id: Id2d0dd4ceaf5501b50c4f0e10268e8f441df34bd
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
10 years agoSAVE: add to save rest of data 11/26711/1
greatim [Thu, 28 Aug 2014 07:23:23 +0000 (16:23 +0900)]
SAVE: add to save rest of data

add mechanism to save the data that cannot be inserted to database at runtime

Change-Id: I8ba758e0bc55e963ace1c390ac8f33618866d8a9
Signed-off-by: greatim <jaewon81.lim@samsung.com>
10 years agowindowingTable, leakTable : fix. null pointer exception. 02/26702/2
Hyunjong.park [Thu, 28 Aug 2014 02:57:15 +0000 (11:57 +0900)]
windowingTable, leakTable : fix. null pointer exception.
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I2044bb596f8aec61164c0da162e3517868160660

10 years agoMerge "WindowingTable : remove old sql connection. Signed-off-by: Hyunjong.park ...
juyoung kim [Thu, 28 Aug 2014 02:47:10 +0000 (19:47 -0700)]
Merge "WindowingTable : remove old sql connection. Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>" into tizen

10 years agoWindowingTable : remove old sql connection. 99/26699/1
Hyunjong.park [Thu, 28 Aug 2014 02:36:55 +0000 (11:36 +0900)]
WindowingTable : remove old sql connection.
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I31870f3f2c5acbf0d47c879b93219759c8e78f2d

10 years agoINTERNAL: database tuning
woojin [Wed, 27 Aug 2014 21:36:53 +0000 (06:36 +0900)]
INTERNAL: database tuning

1. add API for creating index table
2. create index table for function entry/exit
3. improve select query of function exit table for range analysis

Change-Id: I2bebda5ab0d8933ddb07eb693a87d1ef2078dbb9
Signed-off-by: woojin <woojin2.jung@samsung.com>
10 years agoMerge "leaktable : fix. comparator feature Signed-off-by: Hyunjong.park <phjwithyou...
juyoung kim [Wed, 27 Aug 2014 13:16:39 +0000 (06:16 -0700)]
Merge "leaktable : fix. comparator feature Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>" into tizen

10 years agoleaktable : fix. comparator feature 60/26660/1
Hyunjong.park [Wed, 27 Aug 2014 10:29:03 +0000 (19:29 +0900)]
leaktable : fix. comparator feature
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I2bd02c9e56696ca086440117ec0515b4ad41fdda

10 years agoMerge remote-tracking branch 'origin/tizen' into da-file 49/26649/1
hyeran74.kim [Wed, 27 Aug 2014 08:00:41 +0000 (17:00 +0900)]
Merge remote-tracking branch 'origin/tizen' into da-file

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DALimit.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileChartDataMaker.java

Change-Id: Ie3733fbfc5b707a515e701fe3d00a100e60f6eab
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoINTERNAL: fix potentially critical bug 66/26466/2
greatim [Sat, 23 Aug 2014 06:52:59 +0000 (15:52 +0900)]
INTERNAL: fix potentially critical bug

fix potentially critical bug
null pointer dereference, lock not released on all path, resource leaks

Change-Id: I0773f7068399a87d1d3ea131298e886e437a86c8
Signed-off-by: greatim <jaewon81.lim@samsung.com>
10 years agocalltrace : fix. the table time value to change timeline unit 37/26637/1
Hyunjong.park [Wed, 27 Aug 2014 05:54:06 +0000 (14:54 +0900)]
calltrace : fix. the table time value to change timeline unit
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I1b4434360435cdfd7bf5e3aa00dd7ad971c81775

10 years agoPlatform Support: support Windows, Mac OS 31/26631/1
woojin [Tue, 26 Aug 2014 21:23:08 +0000 (06:23 +0900)]
Platform Support: support Windows, Mac OS

1. platform project support (handling debug info/source rpm package) for Windows, Mac
2. md5sum utility for Windows, Mac
3. default location for FileExplorer of debuginfo file : user home directory of each OS
4. other code modification considering multi OS

Change-Id: I8fb01db558f3d58d0993fcb5b89ed22284ab3d4f
Signed-off-by: woojin <woojin2.jung@samsung.com>
10 years agoRange : bug fix for range data creation 88/26588/1
seokgil.kang [Tue, 26 Aug 2014 14:48:14 +0000 (23:48 +0900)]
Range : bug fix for range data creation

Change-Id: Ie4ac83c3255eeb4c040d9f74fb3476a06f76c244
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
10 years agoMerge "Merge branch 'da-timeline' into tizen" into tizen
juyoung kim [Tue, 26 Aug 2014 10:36:34 +0000 (03:36 -0700)]
Merge "Merge branch 'da-timeline' into tizen" into tizen

10 years agoSummary : bug fix for memory overflow check logic and DALimit's variable 54/26554/1
seokgil.kang [Tue, 26 Aug 2014 09:16:30 +0000 (18:16 +0900)]
Summary : bug fix for memory overflow check logic and DALimit's variable

Change-Id: I904dd665ac7dd8108ce92713eea96d063e93c580
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
10 years agoMerge branch 'da-timeline' into tizen 50/26550/1
jungwook.ryu [Tue, 26 Aug 2014 09:00:33 +0000 (18:00 +0900)]
Merge branch 'da-timeline' into tizen

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/EnergyChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java

Change-Id: Id6f77b7640bf81dc1beb3ccc5a7c444fb0f0d452
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoMISC : recover corrupted image file 40/26540/1
jungwook.ryu [Tue, 26 Aug 2014 06:35:07 +0000 (15:35 +0900)]
MISC : recover corrupted image file

Change-Id: I2901ebe69e2b1d944736d39d9a21a92ffc9ee5b5
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoimage : fix. same image file name and image name of source 72/26472/2
Hyunjong.park [Mon, 25 Aug 2014 02:28:29 +0000 (11:28 +0900)]
image : fix. same image file name and image name of source
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: Ib1bd9f7aa40c4cfde658a6887d957d8b05abc382

10 years agoFile : changed some chart UI 79/26479/1
hyeran74.kim [Mon, 25 Aug 2014 06:09:42 +0000 (15:09 +0900)]
File : changed some chart UI
removed other API bar on the chart
changed color of status and access bar on the chart
display warning when the case of the concurrent read/write

Change-Id: I438ed8536d51965c7283f50c7767e5854d992e30
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoTimeline : fix potential bug 08/26408/1
jungwook.ryu [Fri, 22 Aug 2014 05:12:06 +0000 (14:12 +0900)]
Timeline : fix potential bug

Change-Id: I3bab4d2e059a1d96103b465532b9fdff77501f57
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoMerge "INTERNAL : remove potential bugs" into tizen
juyoung kim [Thu, 21 Aug 2014 08:37:28 +0000 (01:37 -0700)]
Merge "INTERNAL : remove potential bugs" into tizen

10 years agoMerge "MISC : add source owner to Boilerplate" into tizen
juyoung kim [Thu, 21 Aug 2014 07:22:57 +0000 (00:22 -0700)]
Merge "MISC : add source owner to Boilerplate" into tizen

10 years agoMerge "INTERNAL: change "<>" ot "[]", and not apply drop log" into tizen
juyoung kim [Thu, 21 Aug 2014 07:22:43 +0000 (00:22 -0700)]
Merge "INTERNAL: change "<>" ot "[]", and not apply drop log" into tizen

10 years agoMISC : add source owner to Boilerplate 67/26367/1
jungwook.ryu [Thu, 21 Aug 2014 06:48:58 +0000 (15:48 +0900)]
MISC : add source owner to Boilerplate

Change-Id: Ie35a0faa302d18d4782b591305a4db135214b236
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoINTERNAL: change "<>" ot "[]", and not apply drop log 65/26365/1
greatim [Thu, 21 Aug 2014 06:33:44 +0000 (15:33 +0900)]
INTERNAL: change "<>" ot "[]", and not apply drop log

"<>" cannot not be used directory name in windows, so change to "[]"
DA do not drop log even if "main" function entry is not coming

Change-Id: I2e50da7b410548bddc01266554d04b1760a74a0a
Signed-off-by: greatim <jaewon81.lim@samsung.com>
10 years agoBUGFIX: remove logger importing
JuYoung Kim [Thu, 21 Aug 2014 06:15:39 +0000 (15:15 +0900)]
BUGFIX: remove logger importing

Change-Id: I9a0022507d2f874e5b63598a841b6aeda8ff9795
Signed-off-by: JuYoung Kim <j0.kim@samsung.com>
10 years agoREFACTOING ByteUtil
JuYoung Kim [Thu, 21 Aug 2014 05:33:35 +0000 (14:33 +0900)]
REFACTOING ByteUtil
1) refactoring getString, getStringLength => add toString, recommend to use toString
2) remove potential bug and add error LOG for getStringLength when the string have no EOS
3) add toReadableString for print Byte Array => printByteArray will not be used

Change-Id: I8fa3defa69034b859a83654fcf73bc7cd6856fbc
Signed-off-by: JuYoung Kim <j0.kim@samsung.com>
10 years agoRefactoring: ByteUtil: change the method order and name
JuYoung Kim [Sun, 17 Aug 2014 08:11:54 +0000 (17:11 +0900)]
Refactoring: ByteUtil: change the method order and name

Change-Id: I53d22d4f112e595a374d0a1218cd92c8f92163cd
Signed-off-by: JuYoung Kim <j0.kim@samsung.com>
Conflicts:
org.tizen.dynamicanalyzer.common/src/org/tizen/dynamicanalyzer/util/ByteUtil.java

10 years agoREFACTORING: ByteSwapper and ByteUtil set deprecated method
JuYoung Kim [Thu, 14 Aug 2014 10:55:00 +0000 (19:55 +0900)]
REFACTORING: ByteSwapper and ByteUtil set deprecated method

Change-Id: Id039603ac40b984af4790d0eecbff15364f436e2
Signed-off-by: JuYoung Kim <j0.kim@samsung.com>
10 years agoTimeline : revision heap chart and System table DB 67/26267/2
jungwook.ryu [Wed, 20 Aug 2014 02:20:44 +0000 (11:20 +0900)]
Timeline : revision heap chart and System table DB

1. Heap chart support checking memory allocation per library
2. Store Thread information to System Data Table.

Change-Id: I4d81eb2595b0f6e00d683f0cbf67b4e60fabc179
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoSummary : modify layout of the warning detail view 38/26338/1
seokgil.kang [Thu, 21 Aug 2014 02:20:52 +0000 (11:20 +0900)]
Summary : modify layout of the warning detail view

Change-Id: I7e16e31811619b7764c69a3a9b6278e0922eeb0f
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
10 years agoCommon : fix potential bugs (Range, Summary) 06/26306/1
seokgil.kang [Wed, 20 Aug 2014 11:03:01 +0000 (20:03 +0900)]
Common : fix potential bugs (Range, Summary)

Change-Id: I557665b87b79d4a895c843c31cc424d8e7a56dbb
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
10 years agoSetting : remove welcomeDialog potential bugs 69/26269/1
heeyoung [Wed, 20 Aug 2014 04:53:25 +0000 (13:53 +0900)]
Setting : remove welcomeDialog potential bugs

Change-Id: I1048e10008d873f62e1527dd399bebd530f7d2e7
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>
10 years agoINTERNAL : remove potential bugs 60/26260/1
woojin [Wed, 20 Aug 2014 00:44:14 +0000 (09:44 +0900)]
INTERNAL : remove potential bugs

remove potential bugs detected by static code analysis

Change-Id: I3a15ada390516e19f3da21afac29401fb0004c94
Signed-off-by: woojin <woojin2.jung@samsung.com>
10 years agoMerge "LOG : change DALogger to the Logger" into tizen
juyoung kim [Tue, 19 Aug 2014 12:25:02 +0000 (05:25 -0700)]
Merge "LOG : change DALogger to the Logger" into tizen

10 years agoLOG : change DALogger to the Logger 72/26072/2
seokgil.kang [Fri, 15 Aug 2014 08:29:48 +0000 (17:29 +0900)]
LOG : change DALogger to the Logger

Change-Id: I26941ca77535c8524a13b8ad1d7dbfcd01204428
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
10 years agoMerge "about dlg : bug fix. Dynamic Analyzer window will be hang while go through...
juyoung kim [Thu, 14 Aug 2014 02:17:59 +0000 (19:17 -0700)]
Merge "about dlg : bug fix. Dynamic Analyzer window will be hang while go through "About Tizen Dynamic Analyzer" icon" into tizen

10 years agoabout dlg : bug fix. Dynamic Analyzer window will be hang while go through "About... 02/26002/1
hyunjong.park [Thu, 14 Aug 2014 02:14:24 +0000 (11:14 +0900)]
about dlg : bug fix. Dynamic Analyzer window will be hang while go through "About Tizen Dynamic Analyzer" icon

Change-Id: Idcf5b16e76cce7425d0beaef62d79a7d10fce1f5
Signed-off-by: hyunjong.park <phjwithyou.park@samsung.com>
10 years agoBUGFIX: when float and double swaping, use floatToRawIntBits instead of floatToIntBit...
JuYoung Kim [Thu, 14 Aug 2014 01:41:55 +0000 (10:41 +0900)]
BUGFIX: when float and double swaping, use floatToRawIntBits instead of floatToIntBits, same to the double case

Change-Id: I33f24b4d5f71c59b0bf9a66e408c8cbcbf28e423
Signed-off-by: JuYoung Kim <j0.kim@samsung.com>
10 years agoMISC : update contact information 64/25964/1
seokgil.kang [Wed, 13 Aug 2014 08:29:09 +0000 (17:29 +0900)]
MISC : update contact information

Change-Id: Ie34a3f525aa1f1eca8fd231194c289ad049a1bca
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
10 years agoMerge "MISC : source code boilerplate" into tizen
juyoung kim [Wed, 13 Aug 2014 07:08:33 +0000 (00:08 -0700)]
Merge "MISC : source code boilerplate" into tizen

10 years agoINTERNAL: update contact information of Jaewon Lim 49/25949/1
greatim [Wed, 13 Aug 2014 06:27:47 +0000 (15:27 +0900)]
INTERNAL: update contact information of Jaewon Lim

update contact information of Jaewon Lim

Change-Id: I89a6cd06933e282c9952db54a44e660b6f037fce
Signed-off-by: greatim <jaewon81.lim@samsung.com>
10 years agoMISC : source code boilerplate 46/25946/1
heeyoung [Wed, 13 Aug 2014 05:47:16 +0000 (14:47 +0900)]
MISC : source code boilerplate

Change-Id: Ia8934b50e01d13a8917947133b40554be34c1530
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>
10 years agoSWAPLogParser : added comments 30/25830/2
hyeran74.kim [Mon, 11 Aug 2014 05:31:55 +0000 (14:31 +0900)]
SWAPLogParser : added comments

Change-Id: I2cb5f7e502583f294950e4bea5960996a63c6d1c
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoCommon : fix split file path including "\" 54/25854/2
jungwook.ryu [Mon, 11 Aug 2014 07:41:00 +0000 (16:41 +0900)]
Common : fix split file path including "\"

Change-Id: Ie43c11d73691ee39670847c3af845b0aa539ac22
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoMerge "MISC : version up (2.1.45)" into tizen
juyoung kim [Mon, 11 Aug 2014 06:17:44 +0000 (23:17 -0700)]
Merge "MISC : version up (2.1.45)" into tizen

10 years agoMISC : version up (2.1.45) 32/25832/1
jungwook.ryu [Mon, 11 Aug 2014 06:15:32 +0000 (15:15 +0900)]
MISC : version up (2.1.45)

Change-Id: Id6fccc2f2f7c52abda78a05514a7ca88dadbf0e8
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoMerge "Timeline : bug fix for OS Windows" into tizen
juyoung kim [Mon, 11 Aug 2014 06:10:14 +0000 (23:10 -0700)]
Merge "Timeline : bug fix for OS Windows" into tizen

10 years agoTimeline : bug fix for OS Windows 31/25831/1
jungwook.ryu [Mon, 11 Aug 2014 05:47:13 +0000 (14:47 +0900)]
Timeline : bug fix for OS Windows

misuse File.separator for separate swap imagePath.

Change-Id: I896380effcbab52ce1f1c49f19d376c7656c4937
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoCALLSTACK : bug fix - callstack of calltrace item is not shown in runtime 27/25727/1
woojin [Sat, 9 Aug 2014 18:21:35 +0000 (03:21 +0900)]
CALLSTACK : bug fix - callstack of calltrace item is not shown in runtime

If callstackdata is removed from memory before insertion to DB is finished, then the callstackdata is not found.
So, maintain certain amount of callstackdata in memory so that callstackdata is available by either memory or DB at all time.

Change-Id: I922ed54852687bec6c60ff770b3196e6d637126c
Signed-off-by: woojin <woojin2.jung@samsung.com>
10 years agoSCREENSHOT : bug fix - when auto screenshot is enabled, periodic screenshot request... 25/25725/1
woojin [Sat, 9 Aug 2014 12:57:22 +0000 (21:57 +0900)]
SCREENSHOT : bug fix - when auto screenshot is enabled, periodic screenshot request should not be sent

1. Periodic screenshot request should be sent only if periodic screenshot feature is set
2. modify text of screenshot setting
Auto Snapshot -> On scene transition
period -> periodically

Change-Id: I2fb2fdf3bf38f8cad7fe65bd5012402606927baa
Signed-off-by: woojin <woojin2.jung@samsung.com>
10 years agoINTERNAL : get actual path of application 24/25724/2
woojin [Sat, 9 Aug 2014 00:18:27 +0000 (09:18 +0900)]
INTERNAL : get actual path of application

using readlink command in target platform via da_command script, get the actual file path of application executable

Change-Id: If326eff72219706dac67a19a029c254707a5ed9c
Signed-off-by: woojin <woojin2.jung@samsung.com>
10 years agoINTERNAL : use function name database / refactoring 23/25723/1
woojin [Fri, 8 Aug 2014 22:56:52 +0000 (07:56 +0900)]
INTERNAL : use function name database / refactoring

1. use function name database - ProfilingData, CallStackUnit, FunctionEntry, FunctionData database
2. use binary info database - ProfilingData, CallStackUnit, FunctionEntry database
3. refactoring of calltrace / callstack / function profiling
4. fix callstack bug - isAddrInBinaryRange function
5. minor fix (typo, remove korean comment, etc..)

Change-Id: If3618e27b150aba9f51235d4a88a56ffc3b5e055
Signed-off-by: woojin <woojin2.jung@samsung.com>
10 years agoMerge remote-tracking branch 'origin/tizen' into da-file 87/25687/1
hyeran74.kim [Fri, 8 Aug 2014 07:11:53 +0000 (16:11 +0900)]
Merge remote-tracking branch 'origin/tizen' into da-file

Change-Id: Ibba69a4a15a333189a15f4c6f529b606c0333c57
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoBUILD: upgrade version 76/25676/1
greatim [Fri, 8 Aug 2014 02:35:23 +0000 (11:35 +0900)]
BUILD: upgrade version

upgrade build version

Change-Id: I108d31ff5f26d2301f70f355858b0fee70ebb6b7
Signed-off-by: greatim <jaewon81.lim@samsung.com>
10 years agoINTERNAL: modify to get process name temporary 75/25675/1
greatim [Fri, 8 Aug 2014 02:19:57 +0000 (11:19 +0900)]
INTERNAL: modify to get process name temporary

until swap manager is loaded in emulator, getProcessName function should be commented for testing

Change-Id: Id2771f21d5c7c651763143a96aa44cf68c4634b7
Signed-off-by: greatim <jaewon81.lim@samsung.com>
10 years agoMerge remote-tracking branch 'origin/tizen' into da-file 02/25602/1
hyeran74.kim [Thu, 7 Aug 2014 08:47:53 +0000 (17:47 +0900)]
Merge remote-tracking branch 'origin/tizen' into da-file

Change-Id: I23c8558a7ac94423b2c47cdd9ce433bd41abed74
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoTimeline : revision DB table for System chart 04/25504/2
jungwook.ryu [Wed, 6 Aug 2014 08:14:26 +0000 (17:14 +0900)]
Timeline : revision DB table for System chart

use array column type and remove needless table

Change-Id: I3b4915eb276edf8c6c4dedda1474bf8fdee4c305
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoMISC : version up to check prerequisite 78/25578/1
jungwook.ryu [Thu, 7 Aug 2014 06:08:53 +0000 (15:08 +0900)]
MISC : version up to check prerequisite

Change-Id: Ic7d9d41266811ce3ba315830527345b45bcded5a
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>
10 years agoMerge "BUILD: unpack workbench plugin" into tizen
juyoung kim [Tue, 5 Aug 2014 08:23:13 +0000 (01:23 -0700)]
Merge "BUILD: unpack workbench plugin" into tizen

10 years agoFILE : considering save and load 23/25423/1
hyeran74.kim [Tue, 5 Aug 2014 02:06:49 +0000 (11:06 +0900)]
FILE : considering save and load

Change-Id: Icdd535861dcbd65552bd1784fdfd1b4096475bc9
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoBUILD: unpack workbench plugin 27/25327/2
greatim [Mon, 4 Aug 2014 04:58:20 +0000 (13:58 +0900)]
BUILD: unpack workbench plugin

unpack org.tizen.dynamicanalyzer.workbench plugin when DA installed

Change-Id: Ia34c39ff2c0dacf156358e1763dd4fb100a980fd
Signed-off-by: greatim <jaewon81.lim@samsung.com>
10 years agotoolbar : to adjust the spacing between icons in toolbar. 60/25360/1
Hyunjong.park [Mon, 4 Aug 2014 10:30:39 +0000 (19:30 +0900)]
toolbar : to adjust the spacing between icons in toolbar.
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I8f853d258ebe6919d3039fb66c4198de6265bd1b

10 years agoFile DetailInfoView : bug fix when updating data on datail info view 37/25337/2
hyeran74.kim [Mon, 4 Aug 2014 06:28:15 +0000 (15:28 +0900)]
File DetailInfoView : bug fix when updating data on datail info view

Change-Id: Iec5e0b886c89d69c1f4950ab5d735ee98ab707d5
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoLogParser : added exeption handling when the probe type in MSG_FUNTION is 4(FILE) 31/25331/2
hyeran74.kim [Mon, 4 Aug 2014 05:55:16 +0000 (14:55 +0900)]
LogParser : added exeption handling when the probe type in MSG_FUNTION is 4(FILE)

Change-Id: I9bf410ded55b94317d77fb9927b6f1fe35610bd5
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoMerge "about dlg : to insert the code to check the file exists. Signed-off-by: Hyunjo...
juyoung kim [Mon, 4 Aug 2014 06:55:58 +0000 (23:55 -0700)]
Merge "about dlg : to insert the code to check the file exists. Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>" into tizen

10 years agoabout dlg : to insert the code to check the file exists. 47/25147/3
Hyunjong.park [Wed, 30 Jul 2014 08:24:34 +0000 (17:24 +0900)]
about dlg : to insert the code to check the file exists.
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I736cba4b0139b0e09a697637f0ef7e508517c59e
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
10 years agoINTERNAL: add protocol for command line name of process 59/25259/3
greatim [Fri, 1 Aug 2014 06:37:36 +0000 (15:37 +0900)]
INTERNAL: add protocol for command line name of process

MSG_GET_PROCESS_ADD_INFO message format is added to protocol.
DA host send request message for command line name of process (name in 'ps'), then SWAP manager send ACK message.

Change-Id: Ib7c7c91a32d050c3dfd825e1eb549b3480721ef1
Signed-off-by: greatim <jaewon81.lim@samsung.com>
10 years agoMerge remote-tracking branch 'origin/tizen' into da-file 26/25326/1
hyeran74.kim [Mon, 4 Aug 2014 04:53:04 +0000 (13:53 +0900)]
Merge remote-tracking branch 'origin/tizen' into da-file

Conflicts:
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ImageResources.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/TabButtonRenderer.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/DACustomButton.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/DACustomButtonRenderer.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomCombo.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboDefaultRenderer.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboPopupDefaultRenderer.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/combo/DACustomComboRenderer.java
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/popupMenu/DAPopupMenuItemButtonRenderer.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerConstants.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DALimit.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/logparser/LogInserter.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/callstack/SWAPCallStackManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/channel/data/ProcessInfoPackage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/LogPackage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/PageDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/LogDataFactory.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ProfileData.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/SystemData.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartBoard.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDetailInfoView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FilePage.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileChartDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/manager/FileDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/old/FileApiListTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/old/FileApiListView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/old/FileChartData.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/old/FileChartDataEvent.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/old/FileChartView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/old/FileDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/old/FileDetailInfoView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/screenshot/ScreenshotDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/kernel/data/KernelDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/data/NetworkDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChartView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLAPIDBTableManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLFrameRateDBTableManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLFrameTimeDBTableManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStateDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStateProgramDBTableManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/type/FrameRateInfo.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPIListView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLContextTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLProgramTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/FunctionUsageProfiler.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/summary/profiling/ProfileDataMaker.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/EnergyDBTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/SystemDataDBTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/UIEventDBTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replay/data/ReplayDBManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/TitleComboPopupRenderer.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/TitleComboRenderer.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/AnalyzerUtil.java

Change-Id: I31c91f7dd48d933bd0681f9655365b8a09753e20
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
10 years agoMerge "config : re-add the icon that has been deleted. Signed-off-by: Hyunjong.park...
juyoung kim [Mon, 4 Aug 2014 04:22:29 +0000 (21:22 -0700)]
Merge "config : re-add the icon that has been deleted. Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>" into tizen

10 years agoMerge "toolbar : change a design that has been mistake applied" into tizen
juyoung kim [Mon, 4 Aug 2014 04:19:24 +0000 (21:19 -0700)]
Merge "toolbar : change a design that has been mistake applied" into tizen

10 years agoMerge "snapshot : apply new design guide Signed-off-by: Hyunjong.park <phjwithyou...
juyoung kim [Mon, 4 Aug 2014 04:18:59 +0000 (21:18 -0700)]
Merge "snapshot : apply new design guide Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>" into tizen

10 years agoMerge "DADialog : fix bug about setting width and height of dialog" into tizen
juyoung kim [Mon, 4 Aug 2014 04:09:08 +0000 (21:09 -0700)]
Merge "DADialog : fix bug about setting width and height of dialog" into tizen

10 years agoconfig : re-add the icon that has been deleted. 95/25195/1
Hyunjong.park [Thu, 31 Jul 2014 06:43:47 +0000 (15:43 +0900)]
config : re-add the icon that has been deleted.
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I790b19886e27589ed913f0402eab9e627b0bee12

10 years agotoolbar : change a design that has been mistake applied 58/25158/1
Hyunjong.park [Wed, 30 Jul 2014 10:06:46 +0000 (19:06 +0900)]
toolbar : change a design that has been mistake applied

Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I79e0efe7e5ad3cba385e4565626ac85e242fd066

10 years agosnapshot : apply new design guide 54/25154/1
Hyunjong.park [Wed, 30 Jul 2014 09:23:10 +0000 (18:23 +0900)]
snapshot : apply new design guide
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I2c51dd1b332a873cb2f32a268cfade681e0fd05c

10 years agotoolbar : apply the 2014 new design guide 34/25134/1
Hyunjong.park [Wed, 30 Jul 2014 07:40:28 +0000 (16:40 +0900)]
toolbar : apply the 2014 new design guide
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I03667aa858688877c9792c3fdb6e5fc1f6c71032