X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=room.go;h=d5693e851bdea6406c9c33c107f75dce22c59d99;hp=99ec208e573ff97be207abeb8fd6f475807a8ec6;hb=9f6cca6c56d12478afb026ca4bd4ec3a688d6c9b;hpb=b67868201041359c456457b62910866a8e072b2b

diff --git a/room.go b/room.go
index 99ec208..d5693e8 100644
--- a/room.go
+++ b/room.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
-Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2016 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ import (
 	"regexp"
 	"sort"
 	"strings"
+	"sync"
 )
 
 var (
@@ -37,51 +38,57 @@ func RoomNameValid(name string) bool {
 }
 
 type Room struct {
-	Verbose   bool
-	name      string
-	topic     string
-	key       string
-	members   map[*Client]bool
-	hostname  *string
-	logSink   chan<- LogEvent
-	stateSink chan<- StateEvent
+	name    *string
+	topic   *string
+	key     *string
+	members map[*Client]struct{}
+	sync.RWMutex
 }
 
-func (room Room) String() string {
-	return room.name
+func (room *Room) String() (name string) {
+	room.RLock()
+	name = *room.name
+	room.RUnlock()
+	return
 }
 
-func NewRoom(hostname *string, name string, logSink chan<- LogEvent, stateSink chan<- StateEvent) *Room {
-	room := Room{name: name}
-	room.members = make(map[*Client]bool)
-	room.topic = ""
-	room.key = ""
-	room.hostname = hostname
-	room.logSink = logSink
-	room.stateSink = stateSink
-	return &room
+func NewRoom(name string) *Room {
+	topic := ""
+	key := ""
+	return &Room{
+		name:    &name,
+		topic:   &topic,
+		key:     &key,
+		members: make(map[*Client]struct{}),
+	}
 }
 
 func (room *Room) SendTopic(client *Client) {
-	if room.topic == "" {
-		client.ReplyNicknamed("331", room.name, "No topic is set")
+	room.RLock()
+	if *room.topic == "" {
+		client.ReplyNicknamed("331", room.String(), "No topic is set")
 	} else {
-		client.ReplyNicknamed("332", room.name, room.topic)
+		client.ReplyNicknamed("332", room.String(), *room.topic)
 	}
+	room.RUnlock()
 }
 
-// Send message to all room's subscribers, possibly excluding someone
+// Send message to all room's subscribers, possibly excluding someone.
 func (room *Room) Broadcast(msg string, clientToIgnore ...*Client) {
+	room.RLock()
 	for member := range room.members {
 		if (len(clientToIgnore) > 0) && member == clientToIgnore[0] {
 			continue
 		}
 		member.Msg(msg)
 	}
+	room.RUnlock()
 }
 
 func (room *Room) StateSave() {
-	room.stateSink <- StateEvent{room.name, room.topic, room.key}
+	room.RLock()
+	stateSink <- StateEvent{room.String(), *room.topic, *room.key}
+	room.RUnlock()
 }
 
 func (room *Room) Processor(events <-chan ClientEvent) {
@@ -89,71 +96,116 @@ func (room *Room) Processor(events <-chan ClientEvent) {
 	for event := range events {
 		client = event.client
 		switch event.eventType {
+		case EventTerm:
+			roomsGroup.Done()
+			return
 		case EventNew:
-			room.members[client] = true
-			if room.Verbose {
+			room.Lock()
+			room.members[client] = struct{}{}
+			if *verbose {
 				log.Println(client, "joined", room.name)
 			}
+			room.Unlock()
 			room.SendTopic(client)
-			room.Broadcast(fmt.Sprintf(":%s JOIN %s", client, room.name))
-			room.logSink <- LogEvent{room.name, client.nickname, "joined", true}
-			nicknames := []string{}
+			room.Broadcast(fmt.Sprintf(":%s JOIN %s", client, room.String()))
+			logSink <- LogEvent{room.String(), *client.nickname, "joined", true}
+			nicknames := make([]string, 0)
+			room.RLock()
 			for member := range room.members {
-				nicknames = append(nicknames, member.nickname)
+				nicknames = append(nicknames, *member.nickname)
 			}
+			room.RUnlock()
 			sort.Strings(nicknames)
-			client.ReplyNicknamed("353", "=", room.name, strings.Join(nicknames, " "))
-			client.ReplyNicknamed("366", room.name, "End of NAMES list")
+			client.ReplyNicknamed("353", "=", room.String(), strings.Join(nicknames, " "))
+			client.ReplyNicknamed("366", room.String(), "End of NAMES list")
 		case EventDel:
+			room.RLock()
 			if _, subscribed := room.members[client]; !subscribed {
-				client.ReplyNicknamed("442", room.name, "You are not on that channel")
+				client.ReplyNicknamed("442", room.String(), "You are not on that channel")
+				room.RUnlock()
 				continue
 			}
+			room.RUnlock()
+			room.Lock()
 			delete(room.members, client)
-			msg := fmt.Sprintf(":%s PART %s :%s", client, room.name, client.nickname)
+			room.Unlock()
+			room.RLock()
+			msg := fmt.Sprintf(":%s PART %s :%s", client, room.String(), *client.nickname)
 			room.Broadcast(msg)
-			room.logSink <- LogEvent{room.name, client.nickname, "left", true}
+			logSink <- LogEvent{room.String(), *client.nickname, "left", true}
+			room.RUnlock()
 		case EventTopic:
+			room.RLock()
 			if _, subscribed := room.members[client]; !subscribed {
-				client.ReplyParts("442", room.name, "You are not on that channel")
+				client.ReplyParts("442", room.String(), "You are not on that channel")
+				room.RUnlock()
 				continue
 			}
 			if event.text == "" {
-				go room.SendTopic(client)
+				room.SendTopic(client)
+				room.RUnlock()
 				continue
 			}
-			room.topic = strings.TrimLeft(event.text, ":")
-			msg := fmt.Sprintf(":%s TOPIC %s :%s", client, room.name, room.topic)
-			go room.Broadcast(msg)
-			room.logSink <- LogEvent{room.name, client.nickname, "set topic to " + room.topic, true}
+			room.RUnlock()
+			topic := strings.TrimLeft(event.text, ":")
+			room.Lock()
+			room.topic = &topic
+			room.Unlock()
+			room.RLock()
+			msg := fmt.Sprintf(":%s TOPIC %s :%s", client, room.String(), *room.topic)
+			room.Broadcast(msg)
+			logSink <- LogEvent{
+				room.String(),
+				*client.nickname,
+				"set topic to " + *room.topic,
+				true,
+			}
+			room.RUnlock()
 			room.StateSave()
 		case EventWho:
+			room.RLock()
 			for m := range room.members {
-				client.ReplyNicknamed("352", room.name, m.username, m.conn.RemoteAddr().String(), *room.hostname, m.nickname, "H", "0 "+m.realname)
+				client.ReplyNicknamed(
+					"352",
+					room.String(),
+					*m.username,
+					m.Host(),
+					*hostname,
+					*m.nickname,
+					"H",
+					"0 "+*m.realname,
+				)
 			}
-			client.ReplyNicknamed("315", room.name, "End of /WHO list")
+			client.ReplyNicknamed("315", room.String(), "End of /WHO list")
+			room.RUnlock()
 		case EventMode:
+			room.RLock()
 			if event.text == "" {
 				mode := "+"
-				if room.key != "" {
+				if *room.key != "" {
 					mode = mode + "k"
 				}
-				client.Msg(fmt.Sprintf("324 %s %s %s", client.nickname, room.name, mode))
+				client.Msg(fmt.Sprintf("324 %s %s %s", *client.nickname, room.String(), mode))
+				room.RUnlock()
 				continue
 			}
 			if strings.HasPrefix(event.text, "b") {
-				client.ReplyNicknamed("368", room.name, "End of channel ban list")
+				client.ReplyNicknamed("368", room.String(), "End of channel ban list")
+				room.RUnlock()
 				continue
 			}
 			if strings.HasPrefix(event.text, "-k") || strings.HasPrefix(event.text, "+k") {
 				if _, subscribed := room.members[client]; !subscribed {
-					client.ReplyParts("442", room.name, "You are not on that channel")
+					client.ReplyParts("442", room.String(), "You are not on that channel")
+					room.RUnlock()
 					continue
 				}
 			} else {
 				client.ReplyNicknamed("472", event.text, "Unknown MODE flag")
+				room.RUnlock()
 				continue
 			}
+			room.RUnlock()
 			var msg string
 			var msgLog string
 			if strings.HasPrefix(event.text, "+k") {
@@ -162,21 +214,38 @@ func (room *Room) Processor(events <-chan ClientEvent) {
 					client.ReplyNotEnoughParameters("MODE")
 					continue
 				}
-				room.key = cols[1]
-				msg = fmt.Sprintf(":%s MODE %s +k %s", client, room.name, room.key)
-				msgLog = "set channel key to " + room.key
-			} else if strings.HasPrefix(event.text, "-k") {
-				room.key = ""
-				msg = fmt.Sprintf(":%s MODE %s -k", client, room.name)
+				room.Lock()
+				room.key = &cols[1]
+				msg = fmt.Sprintf(":%s MODE %s +k %s", client, *room.name, *room.key)
+				msgLog = "set channel key to " + *room.key
+				room.Unlock()
+			} else {
+				key := ""
+				room.Lock()
+				room.key = &key
+				msg = fmt.Sprintf(":%s MODE %s -k", client, *room.name)
+				room.Unlock()
 				msgLog = "removed channel key"
 			}
-			go room.Broadcast(msg)
-			room.logSink <- LogEvent{room.name, client.nickname, msgLog, true}
+			room.Broadcast(msg)
+			logSink <- LogEvent{room.String(), *client.nickname, msgLog, true}
 			room.StateSave()
 		case EventMsg:
 			sep := strings.Index(event.text, " ")
-			room.Broadcast(fmt.Sprintf(":%s %s %s :%s", client, event.text[:sep], room.name, event.text[sep+1:]), client)
-			room.logSink <- LogEvent{room.name, client.nickname, event.text[sep+1:], false}
+			room.Broadcast(fmt.Sprintf(
+				":%s %s %s :%s",
+				client,
+				event.text[:sep],
+				room.String(),
+				event.text[sep+1:]),
+				client,
+			)
+			logSink <- LogEvent{
+				room.String(),
+				*client.nickname,
+				event.text[sep+1:],
+				false,
+			}
 		}
 	}
 }