aboutsummaryrefslogtreecommitdiffstats
path: root/Godeps
diff options
context:
space:
mode:
authorJeffrey Wilcke <geffobscura@gmail.com>2015-08-20 03:46:01 +0800
committerJeffrey Wilcke <geffobscura@gmail.com>2015-08-20 03:46:01 +0800
commit269c5c71072f9e17e6387f853d626bff1160db5c (patch)
tree3a4b1cca074e10495fa1b8f5611a40ad1fba69e8 /Godeps
parent382d35bf403ab5dd9b0d2fe3a87c3960902d6e57 (diff)
downloadgo-tangerine-269c5c71072f9e17e6387f853d626bff1160db5c.tar
go-tangerine-269c5c71072f9e17e6387f853d626bff1160db5c.tar.gz
go-tangerine-269c5c71072f9e17e6387f853d626bff1160db5c.tar.bz2
go-tangerine-269c5c71072f9e17e6387f853d626bff1160db5c.tar.lz
go-tangerine-269c5c71072f9e17e6387f853d626bff1160db5c.tar.xz
go-tangerine-269c5c71072f9e17e6387f853d626bff1160db5c.tar.zst
go-tangerine-269c5c71072f9e17e6387f853d626bff1160db5c.zip
Revert "fdtrack: temporary hack for tracking file descriptor usage"
This reverts commit 5c949d3b3ba81ea0563575b19a7b148aeac4bf61.
Diffstat (limited to 'Godeps')
-rw-r--r--Godeps/_workspace/src/github.com/huin/goupnp/httpu/httpu.go4
-rw-r--r--Godeps/_workspace/src/github.com/huin/goupnp/soap/soap.go14
-rw-r--r--Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/natpmp.go4
-rw-r--r--Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go5
4 files changed, 0 insertions, 27 deletions
diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/httpu/httpu.go b/Godeps/_workspace/src/github.com/huin/goupnp/httpu/httpu.go
index 3f4606af0..862c3def4 100644
--- a/Godeps/_workspace/src/github.com/huin/goupnp/httpu/httpu.go
+++ b/Godeps/_workspace/src/github.com/huin/goupnp/httpu/httpu.go
@@ -9,8 +9,6 @@ import (
"net/http"
"sync"
"time"
-
- "github.com/ethereum/go-ethereum/fdtrack"
)
// HTTPUClient is a client for dealing with HTTPU (HTTP over UDP). Its typical
@@ -27,7 +25,6 @@ func NewHTTPUClient() (*HTTPUClient, error) {
if err != nil {
return nil, err
}
- fdtrack.Open("upnp")
return &HTTPUClient{conn: conn}, nil
}
@@ -36,7 +33,6 @@ func NewHTTPUClient() (*HTTPUClient, error) {
func (httpu *HTTPUClient) Close() error {
httpu.connLock.Lock()
defer httpu.connLock.Unlock()
- fdtrack.Close("upnp")
return httpu.conn.Close()
}
diff --git a/Godeps/_workspace/src/github.com/huin/goupnp/soap/soap.go b/Godeps/_workspace/src/github.com/huin/goupnp/soap/soap.go
index 786ce6fa8..815610734 100644
--- a/Godeps/_workspace/src/github.com/huin/goupnp/soap/soap.go
+++ b/Godeps/_workspace/src/github.com/huin/goupnp/soap/soap.go
@@ -7,12 +7,9 @@ import (
"encoding/xml"
"fmt"
"io/ioutil"
- "net"
"net/http"
"net/url"
"reflect"
-
- "github.com/ethereum/go-ethereum/fdtrack"
)
const (
@@ -29,17 +26,6 @@ type SOAPClient struct {
func NewSOAPClient(endpointURL url.URL) *SOAPClient {
return &SOAPClient{
EndpointURL: endpointURL,
- HTTPClient: http.Client{
- Transport: &http.Transport{
- Dial: func(network, addr string) (net.Conn, error) {
- c, err := net.Dial(network, addr)
- if c != nil {
- c = fdtrack.WrapConn("upnp", c)
- }
- return c, err
- },
- },
- },
}
}
diff --git a/Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/natpmp.go b/Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/natpmp.go
index b165c784e..8ce4e8342 100644
--- a/Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/natpmp.go
+++ b/Godeps/_workspace/src/github.com/jackpal/go-nat-pmp/natpmp.go
@@ -5,8 +5,6 @@ import (
"log"
"net"
"time"
-
- "github.com/ethereum/go-ethereum/fdtrack"
)
// Implement the NAT-PMP protocol, typically supported by Apple routers and open source
@@ -104,8 +102,6 @@ func (n *Client) rpc(msg []byte, resultSize int) (result []byte, err error) {
if err != nil {
return
}
- fdtrack.Open("natpmp")
- defer fdtrack.Close("natpmp")
defer conn.Close()
result = make([]byte, resultSize)
diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go
index 6d44f74b3..46cc9d070 100644
--- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go
+++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go
@@ -18,7 +18,6 @@ import (
"sync"
"time"
- "github.com/ethereum/go-ethereum/fdtrack"
"github.com/syndtr/goleveldb/leveldb/util"
)
@@ -370,8 +369,6 @@ func (fw fileWrap) Close() error {
err := fw.File.Close()
if err != nil {
f.fs.log(fmt.Sprintf("close %s.%d: %v", f.Type(), f.Num(), err))
- } else {
- fdtrack.Close("leveldb")
}
return err
}
@@ -403,7 +400,6 @@ func (f *file) Open() (Reader, error) {
return nil, err
}
ok:
- fdtrack.Open("leveldb")
f.open = true
f.fs.open++
return fileWrap{of, f}, nil
@@ -422,7 +418,6 @@ func (f *file) Create() (Writer, error) {
if err != nil {
return nil, err
}
- fdtrack.Open("leveldb")
f.open = true
f.fs.open++
return fileWrap{of, f}, nil