Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@oberon5962
oberon5962 committed Jan 31, 2022
2 parents 5ffafa4 + 995d67f commit 3be72c9
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 179 deletions.
Binary file modified Sample4/bin/CHORD_4bit.exe
View file
Binary file not shown.
40 changes: 20 additions & 20 deletions Sample4/bin/log/app.txt
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
0 app820 TxRx create
0 app635 TxRx create
0 app422 TxRx create
0 app342 TxRx create
0 app512 TxRx create
0 app765 TxRx create
0 app992 TxRx create
0 app845 TxRx create
0 app445 TxRx create
0 app730 TxRx create
0 app820 Tx > > > generateMess 1(1) HARD_RESET
70 app635 Tx > > > generateMess 1(1) HARD_RESET
140 app422 Tx > > > generateMess 1(1) HARD_RESET
210 app342 Tx > > > generateMess 1(1) HARD_RESET
280 app512 Tx > > > generateMess 1(1) HARD_RESET
350 app765 Tx > > > generateMess 1(1) HARD_RESET
420 app992 Tx > > > generateMess 1(1) HARD_RESET
490 app845 Tx > > > generateMess 1(1) HARD_RESET
560 app445 Tx > > > generateMess 1(1) HARD_RESET
630 app730 Tx > > > generateMess 1(1) HARD_RESET
0 app0 TxRx create
0 app1 TxRx create
0 app2 TxRx create
0 app3 TxRx create
0 app4 TxRx create
0 app7 TxRx create
0 app9 TxRx create
0 app10 TxRx create
0 app12 TxRx create
0 app15 TxRx create
0 app0 Tx > > > generateMess 1(1) HARD_RESET
70 app1 Tx > > > generateMess 1(1) HARD_RESET
140 app2 Tx > > > generateMess 1(1) HARD_RESET
210 app3 Tx > > > generateMess 1(1) HARD_RESET
280 app4 Tx > > > generateMess 1(1) HARD_RESET
350 app7 Tx > > > generateMess 1(1) HARD_RESET
420 app9 Tx > > > generateMess 1(1) HARD_RESET
490 app10 Tx > > > generateMess 1(1) HARD_RESET
560 app12 Tx > > > generateMess 1(1) HARD_RESET
630 app15 Tx > > > generateMess 1(1) HARD_RESET
159 changes: 1 addition & 158 deletions Sample4/bin/log/snapshot.txt
View file
Original file line number Diff line number Diff line change
@@ -1,165 +1,8 @@
0 monitor TxRx create
0 monitor TxRx 10 nodes = { 820 635 422 342 512 765 992 845 445 730 }
0 monitor TxRx 10 nodes = { 0 1 2 3 4 7 9 10 12 15 }

*****************************
{
"active": 0,
"curr time": "0 s"
}
*****************************
{
"active": 10,
"curr time": "769 s",
"nodes": [
{
" cw fing[0: 342+1=343]": "422 (422) period mID 22421266, 762070 ms",
" cw fing[1: 342+2=344]": "422 (422) period mID 22424129, 763070 ms",
" cw fing[2: 342+4=346]": "422 (422) period mID 22429504, 764080 ms",
" cw fing[3: 342+8=350]": "422 (422) period mID 22434484, 765070 ms",
" cw fing[4: 342+16=358]": "422 (422) period mID 22440426, 766070 ms",
" cw fing[5: 342+32=374]": "422 (422) period mID 22444957, 767070 ms",
" cw fing[6: 342+64=406]": "422 (422) period mID 22449418, 768070 ms",
" cw fing[7: 342+128=470]": "512 (512) period mID 22463582, 758080 ms",
" cw fing[8: 342+256=598]": "635 (635) period mID 22467314, 759070 ms",
" cw fing[9: 342+512=854]": "992 (992) period mID 22473770, 760090 ms",
"node_id": "342",
"pred": "992 notify mID 65062521 762080 ms",
"succ": "422 period mID 22421266 762070 ms"
},
{
" cw fing[0: 422+1=423]": "445 (445) stab mID 27701504, 565070 ms",
" cw fing[1: 422+2=424]": "512 (445) period mID 27685395, 557070 ms",
" cw fing[2: 422+4=426]": "512 (445) period mID 27688294, 558070 ms",
" cw fing[3: 422+8=430]": "512 (445) period mID 27692919, 559070 ms",
" cw fing[4: 422+16=438]": "512 (445) period mID 27713668, 549070 ms",
" cw fing[5: 422+32=454]": "512 (512) period mID 27718535, 550080 ms",
" cw fing[6: 422+64=486]": "512 (512) period mID 27656668, 551070 ms",
" cw fing[7: 422+128=550]": "635 (635) period mID 27661729, 552080 ms",
" cw fing[8: 422+256=678]": "765 (730) period mID 27666190, 553070 ms",
" cw fing[9: 422+512=934]": "992 (992) period mID 27671487, 554090 ms",
"node_id": "422",
"pred": "342 notify mID 22476284 761080 ms",
"succ": "445 stab mID 27701504 763070 ms"
},
{
" cw fing[0: 445+1=446]": "512 (512) period mID 29222072, 759080 ms",
" cw fing[1: 445+2=447]": "512 (512) period mID 29225530, 760080 ms",
" cw fing[2: 445+4=449]": "512 (512) period mID 29165432, 761080 ms",
" cw fing[3: 445+8=453]": "512 (512) period mID 29170459, 762080 ms",
" cw fing[4: 445+16=461]": "512 (512) period mID 29174965, 763080 ms",
" cw fing[5: 445+32=477]": "512 (512) period mID 29181458, 764080 ms",
" cw fing[6: 445+64=509]": "512 (512) period mID 29187230, 765080 ms",
" cw fing[7: 445+128=573]": "635 (635) period mID 29191648, 766080 ms",
" cw fing[8: 445+256=701]": "730 (730) period mID 29197219, 767090 ms",
" cw fing[9: 445+512=957]": "992 (992) period mID 29201009, 768090 ms",
"node_id": "445",
"pred": "422 notify mID 29206819 763090 ms",
"succ": "512 period mID 29222072 759080 ms"
},
{
" cw fing[0: 512+1=513]": "635 (635) period mID 33583988, 766090 ms",
" cw fing[1: 512+2=514]": "635 (635) period mID 33587206, 767080 ms",
" cw fing[2: 512+4=516]": "635 (635) period mID 33592584, 768090 ms",
" cw fing[3: 512+8=520]": "635 (635) period mID 33604874, 758100 ms",
" cw fing[4: 512+16=528]": "635 (635) period mID 33610777, 759090 ms",
" cw fing[5: 512+32=544]": "635 (635) period mID 33616921, 760100 ms",
" cw fing[6: 512+64=576]": "635 (635) period mID 33556848, 761090 ms",
" cw fing[7: 512+128=640]": "730 (730) period mID 33560993, 762090 ms",
" cw fing[8: 512+256=768]": "820 (820) period mID 33566182, 763100 ms",
" cw fing[9: 512+512=0]": "342 (342) period mID 33571786, 764090 ms",
"node_id": "512",
"pred": "445 notify mID 29206819 758110 ms",
"succ": "635 period mID 33583988 766090 ms"
},
{
" cw fing[0: 635+1=636]": "730 (730) period mID 41673110, 759060 ms",
" cw fing[1: 635+2=637]": "730 (730) period mID 41675553, 760070 ms",
" cw fing[2: 635+4=639]": "730 (730) period mID 41679778, 761060 ms",
" cw fing[3: 635+8=643]": "730 (730) period mID 41619193, 762060 ms",
" cw fing[4: 635+16=651]": "730 (730) period mID 41624290, 763060 ms",
" cw fing[5: 635+32=667]": "730 (730) period mID 41629926, 764060 ms",
" cw fing[6: 635+64=699]": "730 (730) period mID 41635185, 765060 ms",
" cw fing[7: 635+128=763]": "765 (765) period mID 41640261, 766060 ms",
" cw fing[8: 635+256=891]": "992 (992) period mID 41645740, 767080 ms",
" cw fing[9: 635+512=123]": "342 (342) period mID 41650424, 768060 ms",
"node_id": "635",
"pred": "512 notify mID 33576327 765100 ms",
"succ": "730 period mID 41673110 759060 ms"
},
{
" cw fing[0: 730+1=731]": "765 (765) period mID 47854963, 763100 ms",
" cw fing[1: 730+2=732]": "765 (765) period mID 47859656, 764100 ms",
" cw fing[2: 730+4=734]": "765 (765) period mID 47865224, 765100 ms",
" cw fing[3: 730+8=738]": "765 (765) period mID 47869853, 766090 ms",
" cw fing[4: 730+16=746]": "765 (765) period mID 47875390, 767100 ms",
" cw fing[5: 730+32=762]": "765 (765) period mID 47879598, 768100 ms",
" cw fing[6: 730+64=794]": "820 (820) period mID 47893001, 758100 ms",
" cw fing[7: 730+128=858]": "992 (992) period mID 47898251, 759090 ms",
" cw fing[8: 730+256=986]": "992 (992) period mID 47904488, 760100 ms",
" cw fing[9: 730+512=218]": "342 (342) period mID 47844211, 761090 ms",
"node_id": "730",
"pred": "635 notify mID 47883168 758070 ms",
"succ": "765 period mID 47854963 763100 ms"
},
{
" cw fing[0: 765+1=766]": "820 (820) period mID 50193106, 759070 ms",
" cw fing[1: 765+2=767]": "820 (820) period mID 50194776, 760080 ms",
" cw fing[2: 765+4=769]": "820 (820) period mID 50199311, 761070 ms",
" cw fing[3: 765+8=773]": "820 (820) period mID 50139363, 762070 ms",
" cw fing[4: 765+16=781]": "820 (820) period mID 50144750, 763070 ms",
" cw fing[5: 765+32=797]": "820 (820) period mID 50149803, 764070 ms",
" cw fing[6: 765+64=829]": "845 (845) period mID 50155731, 765070 ms",
" cw fing[7: 765+128=893]": "992 (992) period mID 50160541, 766060 ms",
" cw fing[8: 765+256=1021]": "342 (342) period mID 50166073, 767060 ms",
" cw fing[9: 765+512=253]": "342 (342) period mID 50170649, 768060 ms",
"node_id": "765",
"pred": "730 notify mID 47883168 762110 ms",
"succ": "820 period mID 50193106 759070 ms"
},
{
" cw fing[0: 820+1=821]": "845 (845) period mID 53741138, 761040 ms",
" cw fing[1: 820+2=822]": "845 (845) period mID 53743103, 762040 ms",
" cw fing[2: 820+4=824]": "845 (845) period mID 53747896, 763040 ms",
" cw fing[3: 820+8=828]": "845 (845) period mID 53753366, 764040 ms",
" cw fing[4: 820+16=836]": "845 (845) period mID 53759185, 765040 ms",
" cw fing[5: 820+32=852]": "992 (992) period mID 53763952, 766040 ms",
" cw fing[6: 820+64=884]": "992 (992) period mID 53769269, 767040 ms",
" cw fing[7: 820+128=948]": "992 (992) period mID 53773835, 768040 ms",
" cw fing[8: 820+256=52]": "342 (342) period mID 53786721, 758040 ms",
" cw fing[9: 820+512=308]": "342 (342) period mID 53791931, 759040 ms",
"node_id": "820",
"pred": "765 notify mID 50148909 758080 ms",
"succ": "845 period mID 53741138 761040 ms"
},
{
" cw fing[0: 845+1=846]": "992 (992) period mID 55406820, 766070 ms",
" cw fing[1: 845+2=847]": "992 (992) period mID 55410502, 767070 ms",
" cw fing[2: 845+4=849]": "992 (992) period mID 55414917, 768070 ms",
" cw fing[3: 845+8=853]": "992 (992) period mID 55426212, 758070 ms",
" cw fing[4: 845+16=861]": "992 (992) period mID 55433634, 759070 ms",
" cw fing[5: 845+32=877]": "992 (992) period mID 55439464, 760070 ms",
" cw fing[6: 845+64=909]": "992 (992) period mID 55379133, 761070 ms",
" cw fing[7: 845+128=973]": "992 (992) period mID 55383138, 762070 ms",
" cw fing[8: 845+256=77]": "342 (342) period mID 55387775, 763070 ms",
" cw fing[9: 845+512=333]": "342 (342) period mID 55393501, 764080 ms",
"node_id": "845",
"pred": "820 notify mID 55437949 760050 ms",
"succ": "992 period mID 55406820 766070 ms"
},
{
" cw fing[0: 992+1=993]": "342 (342) period mID 65024742, 763070 ms",
" cw fing[1: 992+2=994]": "342 (342) period mID 65028284, 764070 ms",
" cw fing[2: 992+4=996]": "342 (342) period mID 65033829, 765070 ms",
" cw fing[3: 992+8=1000]": "342 (342) period mID 65038046, 766070 ms",
" cw fing[4: 992+16=1008]": "342 (342) period mID 65043952, 767070 ms",
" cw fing[5: 992+32=0]": "342 (342) period mID 65048398, 768070 ms",
" cw fing[6: 992+64=32]": "342 (342) period mID 65060565, 758070 ms",
" cw fing[7: 992+128=96]": "342 (342) period mID 65066324, 759070 ms",
" cw fing[8: 992+256=224]": "342 (342) period mID 65072602, 760070 ms",
" cw fing[9: 992+512=480]": "512 (512) period mID 65012430, 761100 ms",
"node_id": "992",
"pred": "845 notify mID 55437949 765080 ms",
"succ": "342 period mID 65024742 763070 ms"
}
]
}
2 changes: 1 addition & 1 deletion Sample4/src/inc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ using namespace std;
using json = nlohmann::json;

namespace P2P_MODEL {
const unsigned W = 20;
const unsigned W = 4;
typedef sc_biguint<W> uint160;
typedef sc_biguint<W+8> uint168;
typedef unsigned int uint;
Expand Down

0 comments on commit 3be72c9

Please sign in to comment.