Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
3f923f39
Unverified
Commit
3f923f39
authored
Feb 20, 2017
by
Péter Szilágyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swarm: remove superfluous line break in log statements
parent
189dee26
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
server.go
swarm/api/http/server.go
+4
-8
depo.go
swarm/network/depo.go
+1
-1
No files found.
swarm/api/http/server.go
View file @
3f923f39
...
@@ -293,13 +293,11 @@ func (self *sequentialReader) ReadAt(target []byte, off int64) (n int, err error
...
@@ -293,13 +293,11 @@ func (self *sequentialReader) ReadAt(target []byte, off int64) (n int, err error
self
.
lock
.
Lock
()
self
.
lock
.
Lock
()
// assert self.pos <= off
// assert self.pos <= off
if
self
.
pos
>
off
{
if
self
.
pos
>
off
{
glog
.
V
(
logger
.
Error
)
.
Infof
(
"non-sequential read attempted from sequentialReader; %d > %d"
,
glog
.
V
(
logger
.
Error
)
.
Infof
(
"non-sequential read attempted from sequentialReader; %d > %d"
,
self
.
pos
,
off
)
self
.
pos
,
off
)
panic
(
"Non-sequential read attempt"
)
panic
(
"Non-sequential read attempt"
)
}
}
if
self
.
pos
!=
off
{
if
self
.
pos
!=
off
{
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"deferred read in POST at position %d, offset %d."
,
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"deferred read in POST at position %d, offset %d."
,
self
.
pos
,
off
)
self
.
pos
,
off
)
wait
:=
make
(
chan
bool
)
wait
:=
make
(
chan
bool
)
self
.
ahead
[
off
]
=
wait
self
.
ahead
[
off
]
=
wait
self
.
lock
.
Unlock
()
self
.
lock
.
Unlock
()
...
@@ -315,8 +313,7 @@ func (self *sequentialReader) ReadAt(target []byte, off int64) (n int, err error
...
@@ -315,8 +313,7 @@ func (self *sequentialReader) ReadAt(target []byte, off int64) (n int, err error
for
localPos
<
len
(
target
)
{
for
localPos
<
len
(
target
)
{
n
,
err
=
self
.
reader
.
Read
(
target
[
localPos
:
])
n
,
err
=
self
.
reader
.
Read
(
target
[
localPos
:
])
localPos
+=
n
localPos
+=
n
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"Read %d bytes into buffer size %d from POST, error %v."
,
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"Read %d bytes into buffer size %d from POST, error %v."
,
n
,
len
(
target
),
err
)
n
,
len
(
target
),
err
)
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"POST stream's reading terminated with %v."
,
err
)
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"POST stream's reading terminated with %v."
,
err
)
for
i
:=
range
self
.
ahead
{
for
i
:=
range
self
.
ahead
{
...
@@ -330,8 +327,7 @@ func (self *sequentialReader) ReadAt(target []byte, off int64) (n int, err error
...
@@ -330,8 +327,7 @@ func (self *sequentialReader) ReadAt(target []byte, off int64) (n int, err error
}
}
wait
:=
self
.
ahead
[
self
.
pos
]
wait
:=
self
.
ahead
[
self
.
pos
]
if
wait
!=
nil
{
if
wait
!=
nil
{
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"deferred read in POST at position %d triggered."
,
glog
.
V
(
logger
.
Debug
)
.
Infof
(
"deferred read in POST at position %d triggered."
,
self
.
pos
)
self
.
pos
)
delete
(
self
.
ahead
,
self
.
pos
)
delete
(
self
.
ahead
,
self
.
pos
)
close
(
wait
)
close
(
wait
)
}
}
...
...
swarm/network/depo.go
View file @
3f923f39
...
@@ -120,7 +120,7 @@ func (self *Depo) HandleStoreRequestMsg(req *storeRequestMsgData, p *peer) {
...
@@ -120,7 +120,7 @@ func (self *Depo) HandleStoreRequestMsg(req *storeRequestMsgData, p *peer) {
islocal
=
true
islocal
=
true
//return
//return
}
}
hasher
:=
self
.
hashfunc
()
hasher
:=
self
.
hashfunc
()
hasher
.
Write
(
req
.
SData
)
hasher
.
Write
(
req
.
SData
)
if
!
bytes
.
Equal
(
hasher
.
Sum
(
nil
),
req
.
Key
)
{
if
!
bytes
.
Equal
(
hasher
.
Sum
(
nil
),
req
.
Key
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment