Changeset 3766724


Ignore:
Timestamp:
Apr 6, 2009 10:40:22 PM (11 years ago)
Author:
sponge <sponge@…>
Branches:
master
Children:
2c84cddd
Parents:
495558a
Message:

2009-04-06 sponge

SimpleScheduler? SimpleTimer2 debugging added.
Fix build files for desktopgui.

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • apps/desktopgui/build.xml

    r495558a r3766724  
    33<!-- some examples of how to customize the build. -->
    44<!-- (If you delete it and reopen the project it will be recreated.) -->
     5<!-- By default, only the Clean and Build commands use this build script. -->
     6<!-- Commands such as Run, Debug, and Test only use this build script if -->
     7<!-- the Compile on Save feature is turned off for the project. -->
     8<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
     9<!-- in the project's Project Properties dialog box.-->
    510<project name="desktopgui" default="default" basedir=".">
    611    <description>Builds, tests, and runs the project desktopgui.</description>
  • apps/desktopgui/nbproject/build-impl.xml

    r495558a r3766724  
    153153            <attribute default="${excludes}" name="excludes"/>
    154154            <attribute default="${javac.debug}" name="debug"/>
    155             <attribute default="" name="sourcepath"/>
     155            <attribute default="/does/not/exist" name="sourcepath"/>
    156156            <element name="customize" optional="true"/>
    157157            <sequential>
     
    219219        </macrodef>
    220220    </target>
    221     <target name="-init-macrodef-nbjpda">
     221    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
    222222        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
    223223            <attribute default="${main.class}" name="name"/>
     
    225225            <attribute default="" name="stopclassname"/>
    226226            <sequential>
    227                 <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
     227                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
    228228                    <classpath>
    229229                        <path path="@{classpath}"/>
     
    256256            <istrue value="${have-jdk-older-than-1.4}"/>
    257257        </condition>
     258        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
     259            <os family="windows"/>
     260        </condition>
     261        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
     262            <isset property="debug.transport"/>
     263        </condition>
    258264    </target>
    259265    <target depends="-init-debug-args" name="-init-macrodef-debug">
     
    265271                <java classname="@{classname}" dir="${work.dir}" fork="true">
    266272                    <jvmarg line="${debug-args-line}"/>
    267                     <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
     273                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
    268274                    <jvmarg line="${run.jvmargs}"/>
    269275                    <classpath>
     
    312318            -->
    313319    <target depends="init" name="deps-jar" unless="no.deps"/>
     320    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     321    <target depends="init" name="-check-automatic-build">
     322        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
     323    </target>
     324    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
     325        <antcall target="clean"/>
     326    </target>
    314327    <target depends="init,deps-jar" name="-pre-pre-compile">
    315328        <mkdir dir="${build.classes.dir}"/>
     
    332345        <!-- You can override this target in the ../build.xml file. -->
    333346    </target>
    334     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
     347    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
    335348    <target name="-pre-compile-single">
    336349        <!-- Empty placeholder for easier customization. -->
     
    346359        <!-- You can override this target in the ../build.xml file. -->
    347360    </target>
    348     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
     361    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
    349362    <!--
    350363                ====================
  • apps/desktopgui/nbproject/genfiles.properties

    r495558a r3766724  
    11build.xml.data.CRC32=c4b345cd
    2 build.xml.script.CRC32=9785bb9a
    3 build.xml.stylesheet.CRC32=be360661
     2build.xml.script.CRC32=9c13114f
     3build.xml.stylesheet.CRC32=958a1d3e
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    66nbproject/build-impl.xml.data.CRC32=c4b345cd
    7 nbproject/build-impl.xml.script.CRC32=74d3fda2
    8 nbproject/build-impl.xml.stylesheet.CRC32=487672f9
     7nbproject/build-impl.xml.script.CRC32=8c02c081
     8nbproject/build-impl.xml.stylesheet.CRC32=65b8de21
  • apps/desktopgui/nbproject/project.properties

    r495558a r3766724  
    2626jar.compress=false
    2727javac.classpath=\
    28     ${libs.swing-app-framework.classpath}:\
    2928    ${file.reference.router.jar}:\
    30     ${file.reference.i2p.jar}
     29    ${file.reference.i2p.jar}:\
     30    ${libs.swing-app-framework.classpath}
    3131# Space-separated list of extra javac options
    3232javac.compilerargs=
  • core/java/src/net/i2p/util/SimpleScheduler.java

    r495558a r3766724  
    22
    33import java.util.concurrent.Executors;
    4 import java.util.concurrent.ScheduledFuture;
    54import java.util.concurrent.ScheduledThreadPoolExecutor;
    65import java.util.concurrent.TimeUnit;
     
    9291            Thread rv = Executors.defaultThreadFactory().newThread(r);
    9392            rv.setName(_name +  ' ' + (++_count) + '/' + THREADS);
     93            String name = rv.getThreadGroup().getName();
     94            if(!(name.isEmpty() || name.equals("Main") || name.equals("main"))) {
     95                (new Exception("OWCH! DAMN! Wrong ThreadGroup `" + name +"', `" + rv.getName() + "'")).printStackTrace();
     96            }
    9497            rv.setDaemon(true);
    9598            return rv;
     
    145148            _scheduled = initialDelay + System.currentTimeMillis();
    146149        }
     150        @Override
    147151        public void schedule() {
    148152            _executor.scheduleWithFixedDelay(this, _initialDelay, _timeoutMs, TimeUnit.MILLISECONDS);
    149153        }
     154        @Override
    150155        public void run() {
    151156            super.run();
  • core/java/src/net/i2p/util/SimpleTimer2.java

    r495558a r3766724  
    66import java.util.concurrent.TimeUnit;
    77import java.util.concurrent.ThreadFactory;
    8 import java.util.Map;
    98
    109import net.i2p.I2PAppContext;
     
    5756        }
    5857
     58        @Override
    5959        protected void afterExecute(Runnable r, Throwable t) {
    6060            super.afterExecute(r, t);
     
    6868            Thread rv = Executors.defaultThreadFactory().newThread(r);
    6969            rv.setName(_name + ' ' + (++_count) + '/' + THREADS);
     70            String name = rv.getThreadGroup().getName();
     71            if(!(name.isEmpty() || name.equals("Main") || name.equals("main"))) {
     72                (new Exception("OWCH! DAMN! Wrong ThreadGroup `" + name +"', `" + rv.getName() + "'")).printStackTrace();
     73            }
    7074            rv.setDaemon(true);
    7175            return rv;
     
    233237    }
    234238
     239    @Override
    235240    public String toString() {
    236241        return _name;
  • history.txt

    r495558a r3766724  
     12009-04-06 sponge
     2    * Debugging to make SimpleTimer2 and SimpleScheduler easier to debug.
     3    * Fix for the config files in the GUI from mathiasdm
     4
    152009-04-04 sponge
    26    * Hopeful fixups to the infamous orpahned tunnel problem.
  • router/java/src/net/i2p/router/RouterVersion.java

    r495558a r3766724  
    1818    public final static String ID = "$Revision: 1.548 $ $Date: 2008-06-07 23:00:00 $";
    1919    public final static String VERSION = CoreVersion.VERSION;
    20     public final static long BUILD = 8;
     20    public final static long BUILD = 9;
    2121    public static void main(String args[]) {
    2222        System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
Note: See TracChangeset for help on using the changeset viewer.