Skip to content

Commit

Permalink
Merge pull request #88 from szmyd/merge_v8
Browse files Browse the repository at this point in the history
Merge v8
  • Loading branch information
szmyd authored Jul 24, 2024
2 parents 930daf9 + a85656d commit 5140bff
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class IOMgrConan(ConanFile):
name = "iomgr"
version = "11.3.3"
version = "11.3.4"

homepage = "https://github.com/eBay/IOManager"
description = "Asynchronous event manager"
Expand Down Expand Up @@ -49,6 +49,8 @@ def configure(self):
if self.options.testing == 'off':
if self.options.coverage or self.options.sanitize:
raise ConanInvalidConfiguration("Coverage/Sanitizer requires Testing!")
if self.settings.arch != "x86_64":
self.options["spdk"].native_build = True

def build_requirements(self):
self.build_requires("gtest/1.14.0")
Expand Down
2 changes: 1 addition & 1 deletion src/lib/iomgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ SISL_OPTION_GROUP(iomgr,
(iova_mode, "", "iova-mode", "IO Virtual Address mode ['pa'|'va']",
::cxxopts::value< std::string >()->default_value("pa"), "mode"),
(hdd_streams, "", "hdd_streams", "Number of streams for hdd - overridden value",
::cxxopts::value< uint32_t >(), "count"))
::cxxopts::value< uint32_t >()->default_value("64"), "count"))

//SISL v11 change
SISL_LOGGING_DEF(iomgr)
Expand Down

0 comments on commit 5140bff

Please sign in to comment.