Project

General

Profile

« Previous | Next » 

Revision cc251391

Added by Andreas Kohlbecker about 8 years ago

support for both memory models java 7 and java 8

View differences:

src/main/webapp/manage/MemoryService.jsp
17 17 
    //the servelt context must use the class loader of the Bootloader class otherwise
18 18 
    //getting the status will not work in mulithreading environments !!!
19 19 
    Bootloader bootloader = Bootloader.getBootloader();
20 
    long recommendedMinimumHeap = bootloader.getInstanceManager().recommendedMinimumSpace(AssumedMemoryRequirements.HEAP_CDMSERVER, AssumedMemoryRequirements.HEAP_PER_INSTANCE, null);
21 
    long recommendedMinimumPermGenSpace = bootloader.getInstanceManager().recommendedMinimumSpace(AssumedMemoryRequirements.PERM_GEN_SPACE_CDMSERVER, AssumedMemoryRequirements.PERM_GEN_SPACE_PER_INSTANCE, null);
22 

  		




  
  20
  
    
    Long recommendedMinimumHeap = bootloader.getInstanceManager().recommendedMinimumSpace(AssumedMemoryRequirements.HEAP_CDMSERVER, AssumedMemoryRequirements.HEAP_PER_INSTANCE, null);


  		




  
  21
  
    
    Long recommendedMinimumPermGenSpace = null;


  		




  
  22
  
    
    if(JvmManager.getJvmVersion() == 7){


  		




  
  23
  
    
        recommendedMinimumPermGenSpace = bootloader.getInstanceManager().recommendedMinimumSpace(AssumedMemoryRequirements.PERM_GEN_SPACE_CDMSERVER, AssumedMemoryRequirements.PERM_GEN_SPACE_PER_INSTANCE, null);


  		




  
  24
  
    
    } 


  		




  
  25
  
    
    


  		




  23
  26
  
    
    ObjectMapper jsonMapper = new ObjectMapper();


  		




  24
  27
  
    

  		




  25
  28
  
    
    response.setHeader("Content-Type", "application/json;charset=UTF-8");


  		




  26
  29
  
    

  		




  27
  30
  
    
    MemoryUsage  heapMemoryUsage = JvmManager.getHeapMemoryUsage();


  		




  28
  
  
    
    MemoryUsage  permGenSpaceUsage = JvmManager.getPermGenSpaceUsage();


  		




  
  31
  
    
    MemoryUsage  permGenSpaceUsage = null;


  		




  
  32
  
    
    MemoryUsage  metaSpaceUsage = null;


  		




  
  33
  
    
    if(JvmManager.getJvmVersion() == 7){


  		




  
  34
  
    
        permGenSpaceUsage = JvmManager.getPermGenSpaceUsage();


  		




  
  35
  
    
    } else {


  		




  
  36
  
    
        metaSpaceUsage  = JvmManager.getMetaSpaceUsage();


  		




  
  37
  
    
    }


  		




  29
  38
  
    

  		




  30
  39
  
    
    ObjectNode node = jsonMapper.createObjectNode();


  		




  31
  
  
    
    node.put("recommendedMinimumHeap", recommendedMinimumHeap);


  		




  32
  
  
    
    node.put("recommendedMinimumPermGenSpace", recommendedMinimumPermGenSpace);


  		




  33
  40
  
    
    node.put("availableProcessors", JvmManager.availableProcessors());


  		




  
  41
  
    
    node.put("recommendedMinimumHeap", recommendedMinimumHeap);


  		




  34
  42
  
    
    node.putPOJO("heapMemoryUsage", heapMemoryUsage);


  		




  35
  
  
    
    node.putPOJO("permGenSpaceUsage", permGenSpaceUsage);


  		




  
  43
  
    
    if(JvmManager.getJvmVersion() == 7){


  		




  
  44
  
    
        node.put("recommendedMinimumPermGenSpace", recommendedMinimumPermGenSpace);


  		




  
  45
  
    
        node.putPOJO("permGenSpaceUsage", permGenSpaceUsage);


  		




  
  46
  
    
    } else {


  		




  
  47
  
    
        node.putPOJO("mataSpaceUsage", metaSpaceUsage);


  		




  
  48
  
    
    }


  		




  36
  49
  
    

  		




  37
  50
  
    
    JsonFactory jsonFactory = new JsonFactory();


  		




  38
  51
  
    
    JsonGenerator jg = jsonFactory.createJsonGenerator(out);


  		












Also available in:  Unified diff