comparison src/os/solaris/vm/os_solaris.cpp @ 269:850fdf70db2b

Merge
author jmasa
date Mon, 28 Jul 2008 15:30:23 -0700
parents 1fdb98a17101 d6340ab4105b
children b7f01ad69d30
comparison
equal deleted inserted replaced
238:3df2fe7c4451 269:850fdf70db2b
2655 ids[bottom++] = ids[cur]; 2655 ids[bottom++] = ids[cur];
2656 } 2656 }
2657 } 2657 }
2658 top += r; 2658 top += r;
2659 cur++; 2659 cur++;
2660 }
2661 if (bottom == 0) {
2662 // Handle a situation, when the OS reports no memory available.
2663 // Assume UMA architecture.
2664 ids[0] = 0;
2665 return 1;
2660 } 2666 }
2661 return bottom; 2667 return bottom;
2662 } 2668 }
2663 2669
2664 // Detect the topology change. Typically happens during CPU pluggin-unplugging. 2670 // Detect the topology change. Typically happens during CPU pluggin-unplugging.
4579 } 4585 }
4580 } 4586 }
4581 } 4587 }
4582 4588
4583 void os::Solaris::liblgrp_init() { 4589 void os::Solaris::liblgrp_init() {
4584 void *handle = dlopen("liblgrp.so", RTLD_LAZY); 4590 void *handle = dlopen("liblgrp.so.1", RTLD_LAZY);
4585 if (handle != NULL) { 4591 if (handle != NULL) {
4586 os::Solaris::set_lgrp_home(CAST_TO_FN_PTR(lgrp_home_func_t, dlsym(handle, "lgrp_home"))); 4592 os::Solaris::set_lgrp_home(CAST_TO_FN_PTR(lgrp_home_func_t, dlsym(handle, "lgrp_home")));
4587 os::Solaris::set_lgrp_init(CAST_TO_FN_PTR(lgrp_init_func_t, dlsym(handle, "lgrp_init"))); 4593 os::Solaris::set_lgrp_init(CAST_TO_FN_PTR(lgrp_init_func_t, dlsym(handle, "lgrp_init")));
4588 os::Solaris::set_lgrp_fini(CAST_TO_FN_PTR(lgrp_fini_func_t, dlsym(handle, "lgrp_fini"))); 4594 os::Solaris::set_lgrp_fini(CAST_TO_FN_PTR(lgrp_fini_func_t, dlsym(handle, "lgrp_fini")));
4589 os::Solaris::set_lgrp_root(CAST_TO_FN_PTR(lgrp_root_func_t, dlsym(handle, "lgrp_root"))); 4595 os::Solaris::set_lgrp_root(CAST_TO_FN_PTR(lgrp_root_func_t, dlsym(handle, "lgrp_root")));