github-starred/ollama-ollama
2
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-04-27 16:36:54 -05:00
Code Issues 2.2k Packages Projects Releases 100 Wiki Activity

[PR #2509] [MERGED] handle race condition while setting raw mode in windows #9654

New Issue
Closed
opened 2025-11-12 15:11:10 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-12 15:11:10 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/ollama/ollama/pull/2509
Author: @pdevine
Created: 2/15/2024
Status: ✅ Merged
Merged: 2/15/2024
Merged by: @pdevine

Base: main ← Head: winsyscall

📝 Commits (2)

  • 1514f4a handle race condition while setting raw mode in windows
  • e3048ba lint

📊 Changes

5 files changed (+38 additions, -15 deletions)

View changed files

📝 readline/readline.go (+28 -8)
📝 readline/readline_unix.go (+3 -2)
📝 readline/readline_windows.go (+1 -1)
📝 readline/term.go (+3 -2)
📝 readline/term_windows.go (+3 -2)

📄 Description

This change handles a race condition in the go routine which handles reading in runes. On Windows "raw mode" (i.e. turning off echo/line/processed input) gets turned off too late which would cause ReadRune() to wait until the buffer was full (when it got a new line). This change goes into raw mode faster, but it still needs to happen before any input since we turn it back off again once we start processing output.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/ollama/ollama/pull/2509 **Author:** [@pdevine](https://github.com/pdevine) **Created:** 2/15/2024 **Status:** ✅ Merged **Merged:** 2/15/2024 **Merged by:** [@pdevine](https://github.com/pdevine) **Base:** `main` ← **Head:** `winsyscall` --- ### 📝 Commits (2) - [`1514f4a`](https://github.com/ollama/ollama/commit/1514f4a26ad975fd55878f0ceff7a5782c224d1f) handle race condition while setting raw mode in windows - [`e3048ba`](https://github.com/ollama/ollama/commit/e3048bae2700435383282a49759d39f3c599c9c3) lint ### 📊 Changes **5 files changed** (+38 additions, -15 deletions) <details> <summary>View changed files</summary> 📝 `readline/readline.go` (+28 -8) 📝 `readline/readline_unix.go` (+3 -2) 📝 `readline/readline_windows.go` (+1 -1) 📝 `readline/term.go` (+3 -2) 📝 `readline/term_windows.go` (+3 -2) </details> ### 📄 Description This change handles a race condition in the go routine which handles reading in runes. On Windows "raw mode" (i.e. turning off echo/line/processed input) gets turned off too late which would cause `ReadRune()` to wait until the buffer was full (when it got a new line). This change goes into raw mode faster, but it still needs to happen before any input since we turn it back off again once we start processing output. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-12 15:11:10 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
amd
api
app
bug
build
cli
client2
cloud
compatibility
context-length
create
docker
documentation
embeddings
engine
feature request
feedback wanted
good first issue
gpt-oss
gpu
harmony
help wanted
install
integration
intel
js
linux
macos
memory
model
needs more info
networking
nvidia
ollama.com
performance
pull-request
Mirrored from GitHub Pull Request
 python
question
registry
rendering
thinking
tools
top
windows
wsl
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/ollama-ollama#9654
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?