Overview
| Comment: | OFSystemInfo: Path-related methods require files |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
953421ce9d9883d3ef32ea8e6f2577fa |
| User & Date: | js on 2018-03-11 14:26:25 |
| Other Links: | manifest | tags |
Context
|
2018-03-11
| ||
| 14:39 | .travis.yml: Store logs in /tmp check-in: d3b3396366 user: js tags: trunk | |
| 14:26 | OFSystemInfo: Path-related methods require files check-in: 953421ce9d user: js tags: trunk | |
| 12:55 | Remove OF_PATH_* macros check-in: 156b850131 user: js tags: trunk | |
Changes
Modified src/OFSystemInfo.h from [6c922b98d0] to [3ad9329aa1].
| ︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | * * @brief A class for querying information about the system. */ @interface OFSystemInfo: OFObject #ifdef OF_HAVE_CLASS_PROPERTIES @property (class, readonly, nonatomic) size_t pageSize; @property (class, readonly, nonatomic) size_t numberOfCPUs; @property (class, readonly, nullable, nonatomic) OFString *userDataPath; @property (class, readonly, nullable, nonatomic) OFString *userConfigPath; @property (class, readonly, nullable, nonatomic) OFString *CPUVendor; # if defined(OF_X86_64) || defined(OF_X86) || defined(DOXYGEN) @property (class, readonly, nonatomic) bool supportsMMX; @property (class, readonly, nonatomic) bool supportsSSE; @property (class, readonly, nonatomic) bool supportsSSE2; @property (class, readonly, nonatomic) bool supportsSSE3; @property (class, readonly, nonatomic) bool supportsSSSE3; | > > | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | * * @brief A class for querying information about the system. */ @interface OFSystemInfo: OFObject #ifdef OF_HAVE_CLASS_PROPERTIES @property (class, readonly, nonatomic) size_t pageSize; @property (class, readonly, nonatomic) size_t numberOfCPUs; # ifdef OF_HAVE_FILES @property (class, readonly, nullable, nonatomic) OFString *userDataPath; @property (class, readonly, nullable, nonatomic) OFString *userConfigPath; # endif @property (class, readonly, nullable, nonatomic) OFString *CPUVendor; # if defined(OF_X86_64) || defined(OF_X86) || defined(DOXYGEN) @property (class, readonly, nonatomic) bool supportsMMX; @property (class, readonly, nonatomic) bool supportsSSE; @property (class, readonly, nonatomic) bool supportsSSE2; @property (class, readonly, nonatomic) bool supportsSSE3; @property (class, readonly, nonatomic) bool supportsSSSE3; |
| ︙ | ︙ | |||
60 61 62 63 64 65 66 67 68 69 70 71 72 73 | * * A CPU with multiple cores counts as multiple CPUs. * * @return The number of CPUs installed in the system */ + (size_t)numberOfCPUs; /*! * @brief Returns the path where user data for the application can be stored. * * On Unix systems, this adheres to the XDG Base Directory specification.@n * On Mac OS X and iOS, it uses the `NSApplicationSupportDirectory` directory.@n * On Windows, it uses the `APPDATA` environment variable.@n * On Haiku, it uses the `B_USER_SETTINGS_DIRECTORY` directory. | > | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | * * A CPU with multiple cores counts as multiple CPUs. * * @return The number of CPUs installed in the system */ + (size_t)numberOfCPUs; #ifdef OF_HAVE_FILES /*! * @brief Returns the path where user data for the application can be stored. * * On Unix systems, this adheres to the XDG Base Directory specification.@n * On Mac OS X and iOS, it uses the `NSApplicationSupportDirectory` directory.@n * On Windows, it uses the `APPDATA` environment variable.@n * On Haiku, it uses the `B_USER_SETTINGS_DIRECTORY` directory. |
| ︙ | ︙ | |||
85 86 87 88 89 90 91 92 93 94 95 96 97 98 | * `NSLibraryDirectory` directory.@n * On Windows, it uses the `APPDATA` environment variable.@n * On Haiku, it uses the `B_USER_SETTINGS_DIRECTORY` directory. * * @return The path where user configuration for the application can be stored */ + (nullable OFString *)userConfigPath; /*! * @brief Returns the vendor of the CPU. * * If the vendor could not be determined, `nil` is returned instead. * * @return The vendor of the CPU | > | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | * `NSLibraryDirectory` directory.@n * On Windows, it uses the `APPDATA` environment variable.@n * On Haiku, it uses the `B_USER_SETTINGS_DIRECTORY` directory. * * @return The path where user configuration for the application can be stored */ + (nullable OFString *)userConfigPath; #endif /*! * @brief Returns the vendor of the CPU. * * If the vendor could not be determined, `nil` is returned instead. * * @return The vendor of the CPU |
| ︙ | ︙ |
Modified src/OFSystemInfo.m from [b4c37fc2ed] to [46e156926e].
| ︙ | ︙ | |||
167 168 169 170 171 172 173 174 175 176 177 178 179 180 |
}
+ (size_t)numberOfCPUs
{
return numberOfCPUs;
}
+ (OFString *)userDataPath
{
#if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
| > | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 |
}
+ (size_t)numberOfCPUs
{
return numberOfCPUs;
}
#ifdef OF_HAVE_FILES
+ (OFString *)userDataPath
{
#if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
|
| ︙ | ︙ | |||
341 342 343 344 345 346 347 348 349 350 351 352 353 354 |
if ((var = [env objectForKey: @"HOME"]) == nil)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return [var stringByAppendingPathComponent: @".config"];
#endif
}
+ (OFString *)CPUVendor
{
#if defined(OF_X86_64_ASM) || defined(OF_X86_ASM)
struct x86_regs regs = x86_cpuid(0, 0);
char buffer[12];
| > | 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 |
if ((var = [env objectForKey: @"HOME"]) == nil)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return [var stringByAppendingPathComponent: @".config"];
#endif
}
#endif
+ (OFString *)CPUVendor
{
#if defined(OF_X86_64_ASM) || defined(OF_X86_ASM)
struct x86_regs regs = x86_cpuid(0, 0);
char buffer[12];
|
| ︙ | ︙ |