comparison src/os/solaris/vm/os_solaris.cpp @ 2102:84f36150fcc3

Merge
author dcubed
date Fri, 07 Jan 2011 15:54:32 -0800
parents 5a1e52a439fa b1a2afa37ec4
children 34d64ad817f4
comparison
equal deleted inserted replaced
2094:5a1e52a439fa 2102:84f36150fcc3
1 /* 1 /*
2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
281 (sp <= thread->_stack_base && 281 (sp <= thread->_stack_base &&
282 sp >= thread->_stack_base - thread->_stack_size) || 282 sp >= thread->_stack_base - thread->_stack_size) ||
283 is_error_reported(), 283 is_error_reported(),
284 "sp must be inside of selected thread stack"); 284 "sp must be inside of selected thread stack");
285 285
286 thread->_self_raw_id = raw_id; // mark for quick retrieval 286 thread->set_self_raw_id(raw_id); // mark for quick retrieval
287 _get_thread_cache[ index ] = thread; 287 _get_thread_cache[ index ] = thread;
288 } 288 }
289 return thread; 289 return thread;
290 } 290 }
291 291
5195 } 5195 }
5196 int fd; 5196 int fd;
5197 int o_delete = (oflag & O_DELETE); 5197 int o_delete = (oflag & O_DELETE);
5198 oflag = oflag & ~O_DELETE; 5198 oflag = oflag & ~O_DELETE;
5199 5199
5200 fd = ::open(path, oflag, mode); 5200 fd = ::open64(path, oflag, mode);
5201 if (fd == -1) return -1; 5201 if (fd == -1) return -1;
5202 5202
5203 //If the open succeeded, the file might still be a directory 5203 //If the open succeeded, the file might still be a directory
5204 { 5204 {
5205 struct stat64 buf64; 5205 struct stat64 buf64;