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 |
}
+ (size_t)numberOfCPUs
{
return numberOfCPUs;
}
+ (OFString *)userDataPath
{
| > | | | | | | | | | | | | | | | | | | > | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 |
}
+ (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
/* (1) to disable dead code warning when it is not a weak symbol */
if ((1) && &sysdir_start_search_path_enumeration != NULL) {
sysdir_search_path_enumeration_state state;
state = sysdir_start_search_path_enumeration(
SYSDIR_DIRECTORY_APPLICATION_SUPPORT,
SYSDIR_DOMAIN_MASK_USER);
if (sysdir_get_next_search_path_enumeration(state, pathC) == 0)
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
} else {
# endif
NSSearchPathEnumerationState state;
state = NSStartSearchPathEnumeration(
NSApplicationSupportDirectory, NSUserDomainMask);
if (NSGetNextSearchPathEnumeration(state, pathC) == 0)
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
}
# endif
path = [OFMutableString stringWithUTF8String: pathC];
if ([path hasPrefix: @"~"]) {
OFDictionary *env = [OFApplication environment];
OFString *home;
if ((home = [env objectForKey: @"HOME"]) == nil)
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
[path deleteCharactersInRange: of_range(0, 1)];
[path prependString: home];
}
[path makeImmutable];
return path;
# elif defined(OF_WINDOWS)
OFDictionary *env = [OFApplication environment];
OFString *appData;
if ((appData = [env objectForKey: @"APPDATA"]) == nil)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return appData;
# elif defined(OF_HAIKU)
char pathC[PATH_MAX];
if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false,
pathC, PATH_MAX) != B_OK)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return [OFString stringWithUTF8String: pathC];
# else
OFDictionary *env = [OFApplication environment];
OFString *var;
void *pool;
if ((var = [env objectForKey: @"XDG_DATA_HOME"]) != nil &&
[var length] > 0)
return var;
if ((var = [env objectForKey: @"HOME"]) == nil)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
pool = objc_autoreleasePoolPush();
var = [[OFString pathWithComponents: [OFArray arrayWithObjects:
var, @".local", @"share", nil]] retain];
objc_autoreleasePoolPop(pool);
return [var autorelease];
# endif
}
+ (OFString *)userConfigPath
{
# if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
/* (1) to disable dead code warning when it is not a weak symbol */
if ((1) && &sysdir_start_search_path_enumeration != NULL) {
sysdir_search_path_enumeration_state state;
state = sysdir_start_search_path_enumeration(
SYSDIR_DIRECTORY_LIBRARY, SYSDIR_DOMAIN_MASK_USER);
if (sysdir_get_next_search_path_enumeration(state, pathC) == 0)
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
} else {
# endif
NSSearchPathEnumerationState state;
state = NSStartSearchPathEnumeration(NSLibraryDirectory,
NSUserDomainMask);
if (NSGetNextSearchPathEnumeration(state, pathC) == 0)
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
}
# endif
path = [OFMutableString stringWithUTF8String: pathC];
if ([path hasPrefix: @"~"]) {
OFDictionary *env = [OFApplication environment];
OFString *home;
if ((home = [env objectForKey: @"HOME"]) == nil)
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
[path deleteCharactersInRange: of_range(0, 1)];
[path prependString: home];
}
[path appendString: @"/Preferences"];
[path makeImmutable];
return path;
# elif defined(OF_WINDOWS)
OFDictionary *env = [OFApplication environment];
OFString *appData;
if ((appData = [env objectForKey: @"APPDATA"]) == nil)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return appData;
# elif defined(OF_HAIKU)
char pathC[PATH_MAX];
if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false,
pathC, PATH_MAX) != B_OK)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return [OFString stringWithUTF8String: pathC];
# else
OFDictionary *env = [OFApplication environment];
OFString *var;
if ((var = [env objectForKey: @"XDG_CONFIG_HOME"]) != nil &&
[var length] > 0)
return var;
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];
|
| ︙ | ︙ |