Skip to content

perf: optimize usage of RWMutex in MCPServer for performance #181

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

Merged
merged 3 commits into from
Apr 25, 2025
Merged

perf: optimize usage of RWMutex in MCPServer for performance #181

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
552c66f
refact: optimize usage of RWMutex in MCPServer for concurrency perfor…
cryo-zd Apr 21, 2025
0bed1f8
fix double-checking for AddTools/AddPromt
cryo-zd Apr 22, 2025
8706661
merge main
cryo-zd Apr 23, 2025
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
53 changes: 41 additions & 12 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,11 +407,18 @@ func (s *MCPServer) AddResource(
resource mcp.Resource,
handler ResourceHandlerFunc,
) {
s.capabilitiesMu.Lock()
s.capabilitiesMu.RLock()
if s.capabilities.resources == nil {
s.capabilities.resources = &resourceCapabilities{}
s.capabilitiesMu.RUnlock()

s.capabilitiesMu.Lock()
if s.capabilities.resources == nil {
s.capabilities.resources = &resourceCapabilities{}
}
s.capabilitiesMu.Unlock()
} else {
s.capabilitiesMu.RUnlock()
}
s.capabilitiesMu.Unlock()

s.resourcesMu.Lock()
defer s.resourcesMu.Unlock()
Expand Down Expand Up @@ -444,11 +451,19 @@ func (s *MCPServer) AddResourceTemplate(
template mcp.ResourceTemplate,
handler ResourceTemplateHandlerFunc,
) {
s.capabilitiesMu.Lock()
s.capabilitiesMu.RLock()
if s.capabilities.resources == nil {
s.capabilities.resources = &resourceCapabilities{}
s.capabilitiesMu.RUnlock()

s.capabilitiesMu.Lock()
if s.capabilities.resources == nil {
s.capabilities.resources = &resourceCapabilities{}
}
s.capabilitiesMu.Unlock()
} else {
s.capabilitiesMu.RUnlock()
}
s.capabilitiesMu.Unlock()


s.resourcesMu.Lock()
defer s.resourcesMu.Unlock()
Expand All @@ -466,11 +481,18 @@ func (s *MCPServer) AddResourceTemplate(

// AddPrompt registers a new prompt handler with the given name
func (s *MCPServer) AddPrompt(prompt mcp.Prompt, handler PromptHandlerFunc) {
s.capabilitiesMu.Lock()
s.capabilitiesMu.RLock()
if s.capabilities.prompts == nil {
s.capabilities.prompts = &promptCapabilities{}
s.capabilitiesMu.RUnlock()

s.capabilitiesMu.Lock()
if s.capabilities.prompts == nil {
s.capabilities.prompts = &promptCapabilities{}
}
s.capabilitiesMu.Unlock()
} else {
s.capabilitiesMu.RUnlock()
}
s.capabilitiesMu.Unlock()

s.promptsMu.Lock()
defer s.promptsMu.Unlock()
Expand All @@ -491,11 +513,18 @@ func (s *MCPServer) AddTool(tool mcp.Tool, handler ToolHandlerFunc) {

// AddTools registers multiple tools at once
func (s *MCPServer) AddTools(tools ...ServerTool) {
s.capabilitiesMu.Lock()
s.capabilitiesMu.RLock()
if s.capabilities.tools == nil {
s.capabilities.tools = &toolCapabilities{}
s.capabilitiesMu.RUnlock()

s.capabilitiesMu.Lock()
if s.capabilities.tools == nil {
s.capabilities.tools = &toolCapabilities{}
}
s.capabilitiesMu.Unlock()
} else {
s.capabilitiesMu.RUnlock()
}
s.capabilitiesMu.Unlock()

s.toolsMu.Lock()
for _, entry := range tools {
Expand Down