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.

Sign up for GitHub

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

(DAL) Prevent deadlock from multiple lock and unlock from single func #2000

Merged
merged 1 commit into from
Aug 2, 2024
Merged

(DAL) Prevent deadlock from multiple lock and unlock from single func #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions node/pkg/dal/api/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,13 @@ func HandleWebsocket(conn *websocket.Conn) {
}

if msg.Method == "SUBSCRIBE" {
h.mu.RLock()
h.mu.Lock()

subscriptions, ok := h.clients[threadSafeClient]
if !ok {
subscriptions = map[string]bool{}
}
h.mu.RUnlock()

valid := []string{}

for _, param := range msg.Params {
Expand All @@ -79,7 +80,6 @@ func HandleWebsocket(conn *websocket.Conn) {
subscriptions[symbol] = true
valid = append(valid, param)
}
h.mu.Lock()
h.clients[threadSafeClient] = subscriptions
h.mu.Unlock()
err = stats.InsertWebsocketSubscriptions(*ctx, id, valid)
Expand Down
4 changes: 2 additions & 2 deletions node/pkg/dal/api/hub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ func (c *Hub) broadcastDataForSymbol(symbol string) {
func (c *Hub) castSubmissionData(data *dalcommon.OutgoingSubmissionData, symbol *string) {
var wg sync.WaitGroup

c.mu.RLock()
defer c.mu.RUnlock()
c.mu.Lock()
defer c.mu.Unlock()
for client, subscriptions := range c.clients {
if subscriptions[*symbol] {
wg.Add(1)
Expand Down
2 changes: 1 addition & 1 deletion node/pkg/dal/api/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type Hub struct {
register chan *ThreadSafeClient
unregister chan *ThreadSafeClient
broadcast map[string]chan dalcommon.OutgoingSubmissionData
mu sync.RWMutex
mu sync.Mutex
}

type BulkResponse struct {
Expand Down