Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gofmt #4

Merged
merged 1 commit into from
Jun 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@ package main

import (
"fmt"
// "time"
// "time"
"sync"
)

func main(){
func main() {
fmt.Println("start up server")
ln, err := bind_socket()
if err != nil{
if err != nil {
return
}
network_manager := new(NetworkManager)
network_manager.control_channels = make(map[string]chan string)
network_manager.mutex = new(sync.Mutex)
//start_the_world()
/*
go func(){
timer := time.NewTimer(time.Second * 10)
<-timer.C
fmt.Println("quit all channel")
network_manager.QuitAllChannel()
}()
go func(){
timer := time.NewTimer(time.Second * 10)
<-timer.C
fmt.Println("quit all channel")
network_manager.QuitAllChannel()
}()
*/
for {
conn, err := ln.Accept()
Expand Down
43 changes: 21 additions & 22 deletions msg_queue.go
Original file line number Diff line number Diff line change
@@ -1,47 +1,46 @@
package main

import (
"net"
"fmt"
"io"
"net"
)


const BUFF_LEN = 4096
func HandleConnection(c net.Conn, manager *NetworkManager){

func HandleConnection(c net.Conn, manager *NetworkManager) {
defer c.Close()
fmt.Println("Connection from: ", c.RemoteAddr())
quit := manager.RegisterControlChannel(c)
buff := make([]byte, BUFF_LEN)
loop:
for{
select{
case <-quit:
break loop
default:
count, err := c.Read(buff)
if err != nil{
if err == io.EOF{
fmt.Println("client disconnect")
return
}
fmt.Println(err)
loop:
for {
select {
case <-quit:
break loop
default:
count, err := c.Read(buff)
if err != nil {
if err == io.EOF {
fmt.Println("client disconnect")
return
}
if count != 0{
fmt.Print(string(buff))
c.Write(buff)
}
fmt.Println(err)
return
}
if count != 0 {
fmt.Print(string(buff))
c.Write(buff)
}
}
}
manager.UnregisterControlChannel(c)
}

func bind_socket() (net.Listener, error){
func bind_socket() (net.Listener, error) {
ln, err := net.Listen("tcp", ":19840")
if err != nil {
fmt.Println("bind failed")
}
return ln, err
}

15 changes: 7 additions & 8 deletions network_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"sync"
)

type NetworkManager struct{
online_count int //do i need mutex to protect online count?
type NetworkManager struct {
online_count int //do i need mutex to protect online count?
control_channels map[string]chan string
mutex *sync.Mutex
mutex *sync.Mutex
}

func (this *NetworkManager) RegisterControlChannel(c net.Conn) chan string{
func (this *NetworkManager) RegisterControlChannel(c net.Conn) chan string {
defer this.mutex.Unlock()
this.mutex.Lock()
this.online_count++
Expand All @@ -21,18 +21,17 @@ func (this *NetworkManager) RegisterControlChannel(c net.Conn) chan string{
return this.control_channels[key]
}

func (this *NetworkManager) UnregisterControlChannel(c net.Conn){
func (this *NetworkManager) UnregisterControlChannel(c net.Conn) {
this.online_count--
key := c.RemoteAddr().String()
delete(this.control_channels, key)
}

func (this *NetworkManager) QuitAllChannel(){
func (this *NetworkManager) QuitAllChannel() {
for k, v := range this.control_channels {
go func(ch chan string){
go func(ch chan string) {
fmt.Println(k)
ch <- "quit" //block here
}(v)
}
}