Make us not crash if you flock a file in the file cache

WizKid · facebook-github-bot · commit a7936c6554a7 · 2025-04-23T07:52:56.000-07:00
Reviewed By: jano

Differential Revision: D73464790

fbshipit-source-id: 7b445469b3379a671db50fa93d7202d5b42b27bb
diff --git a/hphp/runtime/base/mem-file.cpp b/hphp/runtime/base/mem-file.cpp
@@ -189,5 +189,9 @@ void MemFile::unzip() {
   m_len = len;
 }
 
+bool MemFile::lock(int operation, bool &wouldblock /* = false */) {
+  return false;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 }
diff --git a/hphp/runtime/base/mem-file.h b/hphp/runtime/base/mem-file.h
@@ -51,6 +51,7 @@ struct MemFile : File {
   bool eof() override;
   bool rewind() override;
   bool flush() override;
+  bool lock(int operation, bool &wouldblock) override;
 
   Array getMetaData() override;
 
@@ -65,4 +66,3 @@ struct MemFile : File {
 
 ///////////////////////////////////////////////////////////////////////////////
 }
-

Original file line number	Diff line number	Diff line change
`@@ -189,5 +189,9 @@ void MemFile::unzip() {`
`189`	`189`	`m_len = len;`
`190`	`190`	`}`
`191`	`191`
	`192`	`+bool MemFile::lock(int operation, bool &wouldblock /* = false */) {`
	`193`	`+ return false;`
	`194`	`+}`
	`195`	`+`
`192`	`196`	`///////////////////////////////////////////////////////////////////////////////`
`193`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ struct MemFile : File {`
`51`	`51`	`bool eof() override;`
`52`	`52`	`bool rewind() override;`
`53`	`53`	`bool flush() override;`
	`54`	`+ bool lock(int operation, bool &wouldblock) override;`
`54`	`55`
`55`	`56`	`Array getMetaData() override;`
`56`	`57`
`@@ -65,4 +66,3 @@ struct MemFile : File {`
`65`	`66`
`66`	`67`	`///////////////////////////////////////////////////////////////////////////////`
`67`	`68`	`}`
`68`		`-`