Commit 7827a82
fix(loader): make native-lib extraction race-safe (atomic write + content reuse)
LlamaLoader.extractFile wrote the native library straight to a fixed
<java.io.tmpdir>/<lib> path with a non-atomic Files.copy(REPLACE_EXISTING), so two JVMs sharing a
tmpdir (e.g. CI matrices) could interleave a partial write with a peer's load, and a rewrite could
replace a file another process had already loaded (which fails on Windows).
extractFile now:
- reuses a byte-identical existing copy (resourceMatchesFile) instead of rewriting it — so it never
replaces a file another JVM has loaded, and skips redundant work; and
- otherwise extracts to a per-attempt unique temp file, verifies it, and atomically moves it into
place (ATOMIC_MOVE, plain-move fallback), so a concurrent loader never observes a half-written lib.
jllama is statically linked (BUILD_SHARED_LIBS OFF), so the extracted file is self-contained — no
multi-DLL co-location to coordinate.
Verified: NativeLibraryLoadSmokeTest extracts+loads the real libjllama.dylib through the new path,
LlamaLoaderTest (+ a resourceMatchesFile unit test) and OSInfoTest pass, Spotless + Javadoc clean.
The Windows locked-replace path is covered by CI's Windows jobs. Full per-process *directory*
isolation remains an optional tidiness follow-up (see TODO.md).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>1 parent 90f95d0 commit 7827a82
3 files changed
Lines changed: 73 additions & 24 deletions
File tree
- src
- main/java/net/ladenthin/llama/loader
- test/java/net/ladenthin/llama/loader
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
35 | 42 | | |
36 | 43 | | |
37 | 44 | | |
| |||
Lines changed: 48 additions & 18 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
210 | 210 | | |
211 | 211 | | |
212 | 212 | | |
213 | | - | |
214 | | - | |
215 | | - | |
216 | | - | |
217 | | - | |
218 | | - | |
219 | | - | |
220 | | - | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
221 | 219 | | |
| 220 | + | |
222 | 221 | | |
223 | 222 | | |
224 | | - | |
225 | | - | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | | - | |
231 | | - | |
232 | | - | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
233 | 232 | | |
234 | | - | |
| 233 | + | |
235 | 234 | | |
236 | 235 | | |
237 | 236 | | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
238 | 241 | | |
239 | 242 | | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
240 | 247 | | |
241 | 248 | | |
242 | 249 | | |
| |||
245 | 252 | | |
246 | 253 | | |
247 | 254 | | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
248 | 278 | | |
249 | 279 | | |
250 | 280 | | |
| |||
Lines changed: 12 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
102 | 114 | | |
103 | 115 | | |
104 | 116 | | |
| |||
0 commit comments