--- old/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp 2015-05-12 11:55:31.810496537 +0200 +++ /dev/null 2015-03-18 17:10:38.111854831 +0100 @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKTHREAD_HPP -#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKTHREAD_HPP - -#include "runtime/thread.hpp" - -// Forward declarations of classes defined here. -class GCTaskThread; -class GCTaskTimeStamp; - -// Declarations of classes referenced in this file via pointer. -class GCTaskManager; - -class GCTaskThread : public WorkerThread { - friend class GCTaskManager; -private: - // Instance state. - GCTaskManager* _manager; // Manager for worker. - const uint _processor_id; // Which processor the worker is on. - - GCTaskTimeStamp* _time_stamps; - uint _time_stamp_index; - - GCTaskTimeStamp* time_stamp_at(uint index); - - bool _is_working; // True if participating in GC tasks - - public: - // Factory create and destroy methods. - static GCTaskThread* create(GCTaskManager* manager, - uint which, - uint processor_id) { - return new GCTaskThread(manager, which, processor_id); - } - static void destroy(GCTaskThread* manager) { - if (manager != NULL) { - delete manager; - } - } - // Methods from Thread. - bool is_GC_task_thread() const { - return true; - } - virtual void run(); - // Methods. - void start(); - - void print_task_time_stamps(); - -protected: - // Constructor. Clients use factory, but there could be subclasses. - GCTaskThread(GCTaskManager* manager, uint which, uint processor_id); - // Destructor: virtual destructor because of virtual methods. - virtual ~GCTaskThread(); - // Accessors. - GCTaskManager* manager() const { - return _manager; - } - uint which() const { - return id(); - } - uint processor_id() const { - return _processor_id; - } - void set_is_working(bool v) { _is_working = v; } -}; - -class GCTaskTimeStamp : public CHeapObj -{ - private: - jlong _entry_time; - jlong _exit_time; - char* _name; - - public: - jlong entry_time() { return _entry_time; } - jlong exit_time() { return _exit_time; } - const char* name() const { return (const char*)_name; } - - void set_entry_time(jlong time) { _entry_time = time; } - void set_exit_time(jlong time) { _exit_time = time; } - void set_name(char* name) { _name = name; } -}; - -#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_GCTASKTHREAD_HPP --- /dev/null 2015-03-18 17:10:38.111854831 +0100 +++ new/src/share/vm/gc/parallel/gcTaskThread.hpp 2015-05-12 11:55:31.585487131 +0200 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP +#define SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP + +#include "runtime/thread.hpp" + +// Forward declarations of classes defined here. +class GCTaskThread; +class GCTaskTimeStamp; + +// Declarations of classes referenced in this file via pointer. +class GCTaskManager; + +class GCTaskThread : public WorkerThread { + friend class GCTaskManager; +private: + // Instance state. + GCTaskManager* _manager; // Manager for worker. + const uint _processor_id; // Which processor the worker is on. + + GCTaskTimeStamp* _time_stamps; + uint _time_stamp_index; + + GCTaskTimeStamp* time_stamp_at(uint index); + + bool _is_working; // True if participating in GC tasks + + public: + // Factory create and destroy methods. + static GCTaskThread* create(GCTaskManager* manager, + uint which, + uint processor_id) { + return new GCTaskThread(manager, which, processor_id); + } + static void destroy(GCTaskThread* manager) { + if (manager != NULL) { + delete manager; + } + } + // Methods from Thread. + bool is_GC_task_thread() const { + return true; + } + virtual void run(); + // Methods. + void start(); + + void print_task_time_stamps(); + +protected: + // Constructor. Clients use factory, but there could be subclasses. + GCTaskThread(GCTaskManager* manager, uint which, uint processor_id); + // Destructor: virtual destructor because of virtual methods. + virtual ~GCTaskThread(); + // Accessors. + GCTaskManager* manager() const { + return _manager; + } + uint which() const { + return id(); + } + uint processor_id() const { + return _processor_id; + } + void set_is_working(bool v) { _is_working = v; } +}; + +class GCTaskTimeStamp : public CHeapObj +{ + private: + jlong _entry_time; + jlong _exit_time; + char* _name; + + public: + jlong entry_time() { return _entry_time; } + jlong exit_time() { return _exit_time; } + const char* name() const { return (const char*)_name; } + + void set_entry_time(jlong time) { _entry_time = time; } + void set_exit_time(jlong time) { _exit_time = time; } + void set_name(char* name) { _name = name; } +}; + +#endif // SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP