Commit 3effedf0 authored by wongoo's avatar wongoo

fix import & merge latest

parent 6664cf2e
# Run Hello Demo # Run Hello Demo
## 1. prepare
```bash ```bash
git clone https://github.com/dubbogo/getty.git git clone https://github.com/dubbogo/getty.git
cd getty/demo/hello cd getty/demo/hello
```
# run server ## 2. run server
go run tcp/server/server.go
# run client run server:
go run tcp/client/client.go `go run tcp/server/server.go`
Or run server in task pool mode:
```bash
go run tcp/server/server.go -taskPool=true \
-task_queue_length=100 \
-task_queue_number=4 \
-task_pool_size=2000
```
## 3. run client
```bash
go run tcp/client/client.go
``` ```
\ No newline at end of file
...@@ -9,11 +9,10 @@ package hello ...@@ -9,11 +9,10 @@ package hello
import ( import (
"github.com/dubbogo/getty" "github.com/dubbogo/getty"
"time"
) )
const ( const (
CronPeriod = 20 * time.Second CronPeriod = 20e9
WritePkgTimeout = 1e8 WritePkgTimeout = 1e8
) )
......
...@@ -8,11 +8,13 @@ ...@@ -8,11 +8,13 @@
package hello package hello
import ( import (
"github.com/dubbogo/getty"
"time" "time"
) )
import (
"github.com/dubbogo/getty"
)
type MessageHandler struct { type MessageHandler struct {
SessionOnOpen func(session getty.Session) SessionOnOpen func(session getty.Session)
} }
...@@ -45,7 +47,7 @@ func (h *MessageHandler) OnMessage(session getty.Session, pkg interface{}) { ...@@ -45,7 +47,7 @@ func (h *MessageHandler) OnMessage(session getty.Session, pkg interface{}) {
func (h *MessageHandler) OnCron(session getty.Session) { func (h *MessageHandler) OnCron(session getty.Session) {
active := session.GetActive() active := session.GetActive()
if CronPeriod.Nanoseconds() < time.Since(active).Nanoseconds() { if CronPeriod < time.Since(active).Nanoseconds() {
log.Infof("OnCorn session{%s} timeout{%s}", session.Stat(), time.Since(active).String()) log.Infof("OnCorn session{%s} timeout{%s}", session.Stat(), time.Since(active).String())
session.Close() session.Close()
} }
......
...@@ -9,6 +9,9 @@ package hello ...@@ -9,6 +9,9 @@ package hello
import ( import (
"errors" "errors"
)
import (
"github.com/dubbogo/getty" "github.com/dubbogo/getty"
) )
......
...@@ -9,7 +9,13 @@ package main ...@@ -9,7 +9,13 @@ package main
import ( import (
"flag" "flag"
)
import (
"github.com/dubbogo/getty" "github.com/dubbogo/getty"
)
import (
"github.com/dubbogo/getty/demo/hello" "github.com/dubbogo/getty/demo/hello"
"github.com/dubbogo/getty/demo/hello/tcp" "github.com/dubbogo/getty/demo/hello/tcp"
"github.com/dubbogo/getty/demo/util" "github.com/dubbogo/getty/demo/util"
......
...@@ -9,13 +9,18 @@ package tcp ...@@ -9,13 +9,18 @@ package tcp
import ( import (
"fmt" "fmt"
"github.com/dubbogo/getty"
"github.com/dubbogo/getty/demo/hello"
"net" "net"
"time" "time"
) )
import (
"github.com/dubbogo/getty"
)
import (
"github.com/dubbogo/getty/demo/hello"
)
var ( var (
pkgHandler = &hello.PackageHandler{} pkgHandler = &hello.PackageHandler{}
eventListener = &hello.MessageHandler{} eventListener = &hello.MessageHandler{}
...@@ -58,7 +63,7 @@ func InitialSession(session getty.Session) (err error) { ...@@ -58,7 +63,7 @@ func InitialSession(session getty.Session) (err error) {
session.SetWQLen(512) session.SetWQLen(512)
session.SetReadTimeout(time.Second) session.SetReadTimeout(time.Second)
session.SetWriteTimeout(5 * time.Second) session.SetWriteTimeout(5 * time.Second)
session.SetCronPeriod(int(hello.CronPeriod.Nanoseconds() / 1e6)) session.SetCronPeriod(int(hello.CronPeriod / 1e6))
session.SetWaitTime(time.Second) session.SetWaitTime(time.Second)
session.SetPkgHandler(pkgHandler) session.SetPkgHandler(pkgHandler)
......
...@@ -9,7 +9,14 @@ package main ...@@ -9,7 +9,14 @@ package main
import ( import (
"flag" "flag"
)
import (
"github.com/dubbogo/getty" "github.com/dubbogo/getty"
gxsync "github.com/dubbogo/gost/sync"
)
import (
"github.com/dubbogo/getty/demo/hello/tcp" "github.com/dubbogo/getty/demo/hello/tcp"
"github.com/dubbogo/getty/demo/util" "github.com/dubbogo/getty/demo/util"
) )
...@@ -22,7 +29,7 @@ var ( ...@@ -22,7 +29,7 @@ var (
) )
var ( var (
taskPoll *getty.TaskPool taskPoll *gxsync.TaskPool
) )
func main() { func main() {
...@@ -33,10 +40,10 @@ func main() { ...@@ -33,10 +40,10 @@ func main() {
options := []getty.ServerOption{getty.WithLocalAddress(":8090")} options := []getty.ServerOption{getty.WithLocalAddress(":8090")}
if *taskPollMode { if *taskPollMode {
taskPoll = getty.NewTaskPool( taskPoll = gxsync.NewTaskPool(
getty.WithTaskPoolTaskQueueLength(*taskPollQueueLength), gxsync.WithTaskPoolTaskQueueLength(*taskPollQueueLength),
getty.WithTaskPoolTaskQueueNumber(*taskPollQueueNumber), gxsync.WithTaskPoolTaskQueueNumber(*taskPollQueueNumber),
getty.WithTaskPoolTaskPoolSize(*taskPollSize), gxsync.WithTaskPoolTaskPoolSize(*taskPollSize),
) )
} }
......
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
package util package util
import "syscall" import (
"syscall"
)
func SetLimit() { func SetLimit() {
var rLimit syscall.Rlimit var rLimit syscall.Rlimit
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment