Skip to content

Commit 2a0e1b4

Browse files
waybackarchiverwaybackarchiver
committed
Change the pooling to a pointer
1 parent a19ddef commit 2a0e1b4

File tree

12 files changed

+51
-41
lines changed

12 files changed

+51
-41
lines changed

‎cmd/wayback/serve.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func serve(_ *cobra.Command, _ []string) {
6161
}
6262

6363
// nolint:gocyclo
64-
func (srv *service) run(ctx context.Context, store *storage.Storage, pool pooling.Pool) *service {
64+
func (srv *service) run(ctx context.Context, store *storage.Storage, pool *pooling.Pool) *service {
6565
size := len(daemon)
6666
srv.targets = make([]target, 0, size)
6767
for _, s := range daemon {

‎pooling/pooling.go

+19-17
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import (
1414
"github.com/wabarc/wayback/errors"
1515
)
1616

17-
var maxTime = 5 * time.Minute
18-
1917
var (
2018
ErrPoolNotExist = errors.New("pool not exist") // ErrPoolNotExist pool not exist
2119
ErrTimeout = errors.New("process timeout") // ErrTimeout process timeout
@@ -28,33 +26,37 @@ type resource struct {
2826
}
2927

3028
// Pool handles a pool of services.
31-
type Pool chan *resource
29+
type Pool struct {
30+
resource chan *resource
31+
timeout time.Duration
32+
}
3233

3334
func newResource(id int) *resource {
3435
return &resource{id: id}
3536
}
3637

3738
// New a resource pool of the specified size
3839
// Resources are created concurrently to save resource initialization time
39-
func New(size int) Pool {
40-
p := make(Pool, size)
40+
func New(size int) *Pool {
41+
p := new(Pool)
42+
p.resource = make(chan *resource, size)
4143
wg := new(sync.WaitGroup)
4244
wg.Add(size)
4345
for i := 0; i < size; i++ {
4446
go func(resId int) {
45-
p <- newResource(resId)
47+
p.resource <- newResource(resId)
4648
wg.Done()
4749
}(i)
4850
}
4951
wg.Wait()
5052

51-
maxTime = config.Opts.WaybackTimeout() + 3*time.Second
53+
p.timeout = config.Opts.WaybackTimeout() + 3*time.Second
5254

5355
return p
5456
}
5557

5658
// Roll wrapper service as function to the resource pool.
57-
func (p Pool) Roll(service func()) {
59+
func (p *Pool) Roll(service func()) {
5860
do := func(wg *sync.WaitGroup) {
5961
defer wg.Done()
6062
fn, ok := q.PopBack().(func())
@@ -79,7 +81,7 @@ func (p Pool) Roll(service func()) {
7981
select {
8082
case <-ch:
8183
logger.Info("roll service completed")
82-
case <-time.After(maxTime):
84+
case <-time.After(p.timeout):
8385
logger.Warn("roll service timeout")
8486
}
8587

@@ -98,26 +100,26 @@ func (p Pool) Roll(service func()) {
98100
wg.Wait()
99101
}
100102

101-
func (p Pool) pull() (r *resource, err error) {
103+
func (p *Pool) pull() (r *resource, err error) {
102104
select {
103-
case r := <-p:
105+
case r := <-p.resource:
104106
return r, nil
105-
case <-time.After(maxTime):
107+
case <-time.After(p.timeout):
106108
return nil, ErrTimeout
107109
}
108110
}
109111

110-
func (p Pool) push(r *resource) error {
112+
func (p *Pool) push(r *resource) error {
111113
if p == nil {
112114
return ErrPoolNotExist
113115
}
114-
p <- r
116+
p.resource <- r
115117
return nil
116118
}
117119

118120
// Close closes worker pool
119-
func (p Pool) Close() {
120-
if p != nil {
121-
close(p)
121+
func (p *Pool) Close() {
122+
if p.resource != nil {
123+
close(p.resource)
122124
}
123125
}

‎pooling/pooling_test.go

+14-6
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ func TestTimeout(t *testing.T) {
2424

2525
logger.SetLogLevel(logger.LevelFatal)
2626

27-
maxTime = time.Microsecond
28-
2927
c := 2
3028
p := New(c)
29+
p.timeout = time.Microsecond
3130

3231
var i int32
3332
var wg sync.WaitGroup
@@ -42,15 +41,24 @@ func TestTimeout(t *testing.T) {
4241
}
4342
wg.Wait()
4443

45-
if len(p) != c {
46-
t.Fatalf("The length of pool got %d instead of %d", len(p), c)
44+
if l := len(p.resource); l != c {
45+
t.Fatalf("The length of pool got %d instead of %d", l, c)
4746
}
4847

4948
p.Roll(func() {
5049
time.Sleep(time.Millisecond)
5150
})
5251

53-
if len(p) != c {
54-
t.Fatalf("The length of pool got %d instead of %d", len(p), c)
52+
if l := len(p.resource); l != c {
53+
t.Fatalf("The length of pool got %d instead of %d", l, c)
54+
}
55+
}
56+
57+
func BenchmarkRoll(b *testing.B) {
58+
p := New(1)
59+
for n := 0; n < b.N; n++ {
60+
p.Roll(func() {
61+
time.Sleep(time.Millisecond)
62+
})
5563
}
5664
}

‎service/discord/discord.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ type Discord struct {
3838

3939
bot *discord.Session
4040
store *storage.Storage
41-
pool pooling.Pool
41+
pool *pooling.Pool
4242
}
4343

4444
// New returns a Discord struct.
45-
func New(ctx context.Context, store *storage.Storage, pool pooling.Pool) *Discord {
45+
func New(ctx context.Context, store *storage.Storage, pool *pooling.Pool) *Discord {
4646
if config.Opts.DiscordBotToken() == "" {
4747
logger.Fatal("missing required environment variable")
4848
}

‎service/httpd/httpd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func newWeb() *web {
4747
return web
4848
}
4949

50-
func (web *web) handle(pool pooling.Pool) http.Handler {
50+
func (web *web) handle(pool *pooling.Pool) http.Handler {
5151
web.router.HandleFunc("/", web.home)
5252
web.router.HandleFunc("/{name}.js", web.showJavascript).Name("javascript").Methods(http.MethodGet)
5353
web.router.HandleFunc("/favicon.ico", web.showFavicon).Name("favicon").Methods(http.MethodGet)

‎service/httpd/tor.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ var ErrServiceClosed = errors.New("httpd: Service closed")
3131
// Tor represents a Tor service in the application.
3232
type Tor struct {
3333
ctx context.Context
34-
pool pooling.Pool
34+
pool *pooling.Pool
3535
store *storage.Storage
3636

3737
tor *tor.Tor
3838
server *http.Server
3939
}
4040

4141
// New tor struct.
42-
func New(ctx context.Context, store *storage.Storage, pool pooling.Pool) *Tor {
42+
func New(ctx context.Context, store *storage.Storage, pool *pooling.Pool) *Tor {
4343
if store == nil {
4444
logger.Fatal("must initialize storage")
4545
}

‎service/mastodon/mastodon.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type Mastodon struct {
3434
sync.RWMutex
3535

3636
ctx context.Context
37-
pool pooling.Pool
37+
pool *pooling.Pool
3838
client *mastodon.Client
3939
store *storage.Storage
4040

@@ -45,7 +45,7 @@ type Mastodon struct {
4545
}
4646

4747
// New mastodon struct.
48-
func New(ctx context.Context, store *storage.Storage, pool pooling.Pool) *Mastodon {
48+
func New(ctx context.Context, store *storage.Storage, pool *pooling.Pool) *Mastodon {
4949
if !config.Opts.PublishToMastodon() {
5050
logger.Fatal("missing required environment variable")
5151
}

‎service/matrix/matrix.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ type Matrix struct {
3333
sync.RWMutex
3434

3535
ctx context.Context
36-
pool pooling.Pool
36+
pool *pooling.Pool
3737
client *matrix.Client
3838
store *storage.Storage
3939
}
4040

4141
// New Matrix struct.
42-
func New(ctx context.Context, store *storage.Storage, pool pooling.Pool) *Matrix {
42+
func New(ctx context.Context, store *storage.Storage, pool *pooling.Pool) *Matrix {
4343
if config.Opts.MatrixUserID() == "" || config.Opts.MatrixPassword() == "" || config.Opts.MatrixHomeserver() == "" {
4444
logger.Fatal("missing required environment variable")
4545
}

‎service/relaychat/relaychat.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ type IRC struct {
3131
sync.RWMutex
3232

3333
ctx context.Context
34-
pool pooling.Pool
34+
pool *pooling.Pool
3535
conn *irc.Connection
3636
store *storage.Storage
3737
}
3838

3939
// New IRC struct.
40-
func New(ctx context.Context, store *storage.Storage, pool pooling.Pool) *IRC {
40+
func New(ctx context.Context, store *storage.Storage, pool *pooling.Pool) *IRC {
4141
if config.Opts.IRCNick() == "" {
4242
logger.Fatal("missing required environment variable")
4343
}

‎service/slack/slack.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ type Slack struct {
5858
bot *slack.Client
5959
client *socketmode.Client
6060
store *storage.Storage
61-
pool pooling.Pool
61+
pool *pooling.Pool
6262
}
6363

6464
type event struct {
6565
User, Text, Channel, TimeStamp, ThreadTimeStamp string
6666
}
6767

6868
// New Slack struct.
69-
func New(ctx context.Context, store *storage.Storage, pool pooling.Pool) *Slack {
69+
func New(ctx context.Context, store *storage.Storage, pool *pooling.Pool) *Slack {
7070
if config.Opts.SlackBotToken() == "" {
7171
logger.Fatal("missing required environment variable")
7272
}

‎service/telegram/telegram.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ type Telegram struct {
4646

4747
bot *telegram.Bot
4848
store *storage.Storage
49-
pool pooling.Pool
49+
pool *pooling.Pool
5050
}
5151

5252
// New Telegram struct.
53-
func New(ctx context.Context, store *storage.Storage, pool pooling.Pool) *Telegram {
53+
func New(ctx context.Context, store *storage.Storage, pool *pooling.Pool) *Telegram {
5454
if config.Opts.TelegramToken() == "" {
5555
logger.Fatal("missing required environment variable")
5656
}

‎service/twitter/twitter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type Twitter struct {
3434
sync.RWMutex
3535

3636
ctx context.Context
37-
pool pooling.Pool
37+
pool *pooling.Pool
3838
client *twitter.Client
3939
store *storage.Storage
4040

@@ -44,7 +44,7 @@ type Twitter struct {
4444
}
4545

4646
// New returns Twitter struct.
47-
func New(ctx context.Context, store *storage.Storage, pool pooling.Pool) *Twitter {
47+
func New(ctx context.Context, store *storage.Storage, pool *pooling.Pool) *Twitter {
4848
if !config.Opts.PublishToTwitter() {
4949
logger.Fatal("missing required environment variable")
5050
}

0 commit comments

Comments
 (0)