jdk/test/java/lang/management/ThreadMXBean/ThreadUserTime.java
author ykantser
Thu, 07 May 2015 09:11:49 +0200
changeset 30376 2ccf2cf7ea48
parent 5506 202f599c92aa
child 44423 306c020eb154
permissions -rw-r--r--
8078896: Add @modules as needed to the jdk_svc tests Reviewed-by: alanb, mchung
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     1
/*
30376
2ccf2cf7ea48 8078896: Add @modules as needed to the jdk_svc tests
ykantser
parents: 5506
diff changeset
     2
 * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     4
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
90ce3da70b43 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
90ce3da70b43 Initial load
duke
parents:
diff changeset
     7
 * published by the Free Software Foundation.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     8
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
90ce3da70b43 Initial load
duke
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
90ce3da70b43 Initial load
duke
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    13
 * accompanied this code).
90ce3da70b43 Initial load
duke
parents:
diff changeset
    14
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
90ce3da70b43 Initial load
duke
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    18
 *
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    21
 * questions.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    22
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    23
90ce3da70b43 Initial load
duke
parents:
diff changeset
    24
/*
90ce3da70b43 Initial load
duke
parents:
diff changeset
    25
 * @test
90ce3da70b43 Initial load
duke
parents:
diff changeset
    26
 * @bug     4997799
90ce3da70b43 Initial load
duke
parents:
diff changeset
    27
 * @summary Basic test of ThreadMXBean.getThreadUserTime and
90ce3da70b43 Initial load
duke
parents:
diff changeset
    28
 *          getCurrentThreadUserTime.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    29
 * @author  Mandy Chung
30376
2ccf2cf7ea48 8078896: Add @modules as needed to the jdk_svc tests
ykantser
parents: 5506
diff changeset
    30
 * @modules java.management
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    31
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    32
90ce3da70b43 Initial load
duke
parents:
diff changeset
    33
import java.lang.management.*;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    34
90ce3da70b43 Initial load
duke
parents:
diff changeset
    35
public class ThreadUserTime {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    36
    private static ThreadMXBean mbean = ManagementFactory.getThreadMXBean();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    37
    private static boolean testFailed = false;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    38
    private static boolean done = false;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    39
    private static Object obj = new Object();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    40
    private static final int NUM_THREADS = 10;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    41
    private static Thread[] threads = new Thread[NUM_THREADS];
90ce3da70b43 Initial load
duke
parents:
diff changeset
    42
    private static long[] times = new long[NUM_THREADS];
90ce3da70b43 Initial load
duke
parents:
diff changeset
    43
90ce3da70b43 Initial load
duke
parents:
diff changeset
    44
    // careful about this value
90ce3da70b43 Initial load
duke
parents:
diff changeset
    45
    private static final int DELTA = 100;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    46
90ce3da70b43 Initial load
duke
parents:
diff changeset
    47
    public static void main(String[] argv)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    48
        throws Exception {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    49
        if (!mbean.isCurrentThreadCpuTimeSupported()) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    50
            return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    51
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    52
90ce3da70b43 Initial load
duke
parents:
diff changeset
    53
        // disable user time
90ce3da70b43 Initial load
duke
parents:
diff changeset
    54
        if (mbean.isThreadCpuTimeEnabled()) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    55
            mbean.setThreadCpuTimeEnabled(false);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    56
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    57
90ce3da70b43 Initial load
duke
parents:
diff changeset
    58
        Thread curThread = Thread.currentThread();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    59
        long t = mbean.getCurrentThreadUserTime();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    60
        if (t != -1) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    61
            throw new RuntimeException("Invalid CurrenThreadUserTime returned = " +
90ce3da70b43 Initial load
duke
parents:
diff changeset
    62
                t + " expected = -1");
90ce3da70b43 Initial load
duke
parents:
diff changeset
    63
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    64
90ce3da70b43 Initial load
duke
parents:
diff changeset
    65
        if (mbean.isThreadCpuTimeSupported()) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    66
            long t1 = mbean.getThreadUserTime(curThread.getId());
90ce3da70b43 Initial load
duke
parents:
diff changeset
    67
            if (t1 != -1) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    68
                throw new RuntimeException("Invalid ThreadUserTime returned = " +
90ce3da70b43 Initial load
duke
parents:
diff changeset
    69
                    t1 + " expected = -1");
90ce3da70b43 Initial load
duke
parents:
diff changeset
    70
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    71
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    72
90ce3da70b43 Initial load
duke
parents:
diff changeset
    73
        // Enable CPU Time measurement
90ce3da70b43 Initial load
duke
parents:
diff changeset
    74
        if (!mbean.isThreadCpuTimeEnabled()) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    75
            mbean.setThreadCpuTimeEnabled(true);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    76
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    77
90ce3da70b43 Initial load
duke
parents:
diff changeset
    78
        if (!mbean.isThreadCpuTimeEnabled()) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    79
            throw new RuntimeException("ThreadUserTime is expected to be enabled");
90ce3da70b43 Initial load
duke
parents:
diff changeset
    80
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    81
90ce3da70b43 Initial load
duke
parents:
diff changeset
    82
        long time = mbean.getCurrentThreadUserTime();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    83
        if (time < 0) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    84
            throw new RuntimeException("Invalid user time returned = " + time);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    85
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    86
90ce3da70b43 Initial load
duke
parents:
diff changeset
    87
        if (!mbean.isThreadCpuTimeSupported()) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    88
            return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    89
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    90
90ce3da70b43 Initial load
duke
parents:
diff changeset
    91
90ce3da70b43 Initial load
duke
parents:
diff changeset
    92
        // Expected to be time1 >= time
90ce3da70b43 Initial load
duke
parents:
diff changeset
    93
        long time1 = mbean.getThreadUserTime(curThread.getId());
90ce3da70b43 Initial load
duke
parents:
diff changeset
    94
        if (time1 < time) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    95
            throw new RuntimeException("User time " + time1 +
90ce3da70b43 Initial load
duke
parents:
diff changeset
    96
                " expected >= " + time);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    97
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    98
        System.out.println(curThread.getName() +
90ce3da70b43 Initial load
duke
parents:
diff changeset
    99
            " Current Thread User Time = " + time +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   100
            " user time = " + time1);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   101
90ce3da70b43 Initial load
duke
parents:
diff changeset
   102
        for (int i = 0; i < NUM_THREADS; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   103
            threads[i] = new MyThread("MyThread-" + i);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   104
            threads[i].start();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   105
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   106
90ce3da70b43 Initial load
duke
parents:
diff changeset
   107
        waitUntilThreadBlocked();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   108
90ce3da70b43 Initial load
duke
parents:
diff changeset
   109
        for (int i = 0; i < NUM_THREADS; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   110
            times[i] = mbean.getThreadUserTime(threads[i].getId());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   111
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   112
90ce3da70b43 Initial load
duke
parents:
diff changeset
   113
        goSleep(200);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   114
90ce3da70b43 Initial load
duke
parents:
diff changeset
   115
        for (int i = 0; i < NUM_THREADS; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   116
            long newTime = mbean.getThreadUserTime(threads[i].getId());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   117
            if (times[i] > newTime) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   118
                throw new RuntimeException("TEST FAILED: " +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   119
                    threads[i].getName() +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   120
                    " previous user user time = " + times[i] +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   121
                    " > current user user time = " + newTime);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   122
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   123
            if ((times[i] + DELTA) < newTime) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   124
                throw new RuntimeException("TEST FAILED: " +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   125
                    threads[i].getName() +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   126
                    " user time = " + newTime +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   127
                    " previous user time " + times[i] +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   128
                    " out of expected range");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   129
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   130
90ce3da70b43 Initial load
duke
parents:
diff changeset
   131
            System.out.println(threads[i].getName() +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   132
                " Previous User Time = " + times[i] +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   133
                " Current User time = " + newTime);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   134
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   135
90ce3da70b43 Initial load
duke
parents:
diff changeset
   136
        synchronized (obj) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   137
            done = true;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   138
            obj.notifyAll();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   139
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   140
90ce3da70b43 Initial load
duke
parents:
diff changeset
   141
        for (int i = 0; i < NUM_THREADS; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   142
            try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   143
                threads[i].join();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   144
            } catch (InterruptedException e) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   145
                System.out.println("Unexpected exception is thrown.");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   146
                e.printStackTrace(System.out);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   147
                testFailed = true;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   148
                break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   149
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   150
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   151
        if (testFailed) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   152
            throw new RuntimeException("TEST FAILED");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   153
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   154
90ce3da70b43 Initial load
duke
parents:
diff changeset
   155
        System.out.println("Test passed");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   156
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   157
90ce3da70b43 Initial load
duke
parents:
diff changeset
   158
90ce3da70b43 Initial load
duke
parents:
diff changeset
   159
    private static void goSleep(long ms) throws Exception {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   160
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   161
            Thread.sleep(ms);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   162
        } catch (InterruptedException e) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   163
            System.out.println("Unexpected exception is thrown.");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   164
            throw e;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   165
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   166
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   167
90ce3da70b43 Initial load
duke
parents:
diff changeset
   168
    private static void waitUntilThreadBlocked()
90ce3da70b43 Initial load
duke
parents:
diff changeset
   169
        throws Exception {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   170
        int count = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   171
        while (count != NUM_THREADS) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   172
            goSleep(100);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   173
            count = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   174
            for (int i = 0; i < NUM_THREADS; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   175
                ThreadInfo info = mbean.getThreadInfo(threads[i].getId());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   176
                if (info.getThreadState() == Thread.State.WAITING) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   177
                    count++;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   178
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   179
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   180
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   181
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   182
90ce3da70b43 Initial load
duke
parents:
diff changeset
   183
    static class MyThread extends Thread {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   184
        public MyThread(String name) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   185
            super(name);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   186
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   187
90ce3da70b43 Initial load
duke
parents:
diff changeset
   188
        public void run() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   189
            double sum = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   190
            for (int i = 0; i < 5000; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   191
               double r = Math.random();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   192
               double x = Math.pow(3, r);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   193
               sum += x - r;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   194
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   195
            synchronized (obj) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   196
                while (!done) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   197
                    try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   198
                        obj.wait();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   199
                    } catch (InterruptedException e) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   200
                        System.out.println("Unexpected exception is thrown.");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   201
                        e.printStackTrace(System.out);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   202
                        testFailed = true;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   203
                        break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   204
                    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   205
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   206
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   207
            sum = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   208
            for (int i = 0; i < 5000; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   209
               double r = Math.random();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   210
               double x = Math.pow(3, r);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   211
               sum += x - r;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   212
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   213
90ce3da70b43 Initial load
duke
parents:
diff changeset
   214
            long time1 = mbean.getCurrentThreadCpuTime();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   215
            long utime1 = mbean.getCurrentThreadUserTime();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   216
            long time2 = mbean.getThreadCpuTime(getId());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   217
            long utime2 = mbean.getThreadUserTime(getId());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   218
90ce3da70b43 Initial load
duke
parents:
diff changeset
   219
            System.out.println(getName() + ":");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   220
            System.out.println("CurrentThreadUserTime = " + utime1 +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   221
                " ThreadUserTime = " + utime2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   222
            System.out.println("CurrentThreadCpuTime  = " + time1 +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   223
                " ThreadCpuTime  = " + time2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   224
90ce3da70b43 Initial load
duke
parents:
diff changeset
   225
            if (time1 > time2) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   226
                throw new RuntimeException("TEST FAILED: " + getName() +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   227
                    " CurrentThreadCpuTime = " + time1 +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   228
                    " > ThreadCpuTime = " + time2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   229
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   230
            if (utime1 > utime2) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   231
                throw new RuntimeException("TEST FAILED: " + getName() +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   232
                    " CurrentThreadUserTime = " + utime1 +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   233
                    " > ThreadUserTime = " + utime2);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   234
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   235
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   236
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   237
90ce3da70b43 Initial load
duke
parents:
diff changeset
   238
}