stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,767 Commits 2 Branches 0 Tags 1.2 GiB
7176203044
Commit Graph

247 Commits

Author SHA1 Message Date
Tobias Hartmann
cd01de591a 8015774: Add support for multiple code heaps 
Support for segmentation of the code cache. Separate code heaps are created and used to store code of different types.

Reviewed-by: kvn, iveresov, roland, anoll, egahlin, sla
 2014-09-17 08:00:07 +02:00
Magnus Ihse Bursie
2678b42e96 8056999: Make hotspot builds less verbose on default log level 
Reviewed-by: dholmes, erikj
 2014-09-16 12:13:13 +02:00
Niclas Adlertz
d348978bc1 Merge 2014-09-12 09:17:58 +02:00
Niclas Adlertz
1b124f9f48 Merge 2014-09-09 16:14:40 +02:00
Igor Veresov
5db7b3a4e1 8056124: Hotspot should use PICL interface to get cacheline size on SPARC 
Using libpicl to get L1 data and L2 cache line sizes

Reviewed-by: kvn, roland, morris
 2014-09-05 11:23:47 -07:00
Jesper Wilhelmsson
366ea37781 8056056: Remove unnecessary inclusion of HS_ALT_MAKE from solaris Makefile 
Remove unnecessary inclusion of HS_ALT_MAKE from solaris Makefile

Reviewed-by: erikj, dholmes
 2014-09-05 00:28:43 +02:00
Lois Foltan
a2acb924db Merge 2014-08-28 13:01:44 -04:00
Lois Foltan
960d0fc613 8054355: ENFORCE_CC_COMPILER_REV needs to be updated to Solaris C++ 12u3 for JDK 9 
Update of C++ validiation check for JDK 9 on Solaris.

Reviewed-by: coleenp, dcubed, kvn
 2014-08-28 11:56:06 -04:00
Coleen Phillimore
73d759e533 8049105: Move array component mirror to instance of java/lang/Class (hotspot part 2) 
This removes component mirrors from arrayKlass metadata and the C2 intrinsic for them.

Reviewed-by: kvn, twisti, mgerdin
 2014-08-28 11:29:09 -04:00
Erik Joelsson
152cf7d4ba 8056053: Disable HOTSPOT_BUILD_JOBS when building with configure 
Reviewed-by: dholmes, ihse, dcubed
 2014-08-28 11:59:04 +02:00
Jesper Wilhelmsson
6b88c2205a 8055744: 8u-dev nightly solaris builds failed on 08/20 
Fixed makefiles on solaris to allow build with extra symbols.

Reviewed-by: dcubed, erikj
 2014-08-22 13:24:04 +02:00
Jesper Wilhelmsson
9390fa3b72 8055006: Store original value of Min/MaxHeapFreeRatio 
Store the value set by the user and some makefile changes required to change the flags.

Reviewed-by: sla, mchung, bchristi, jmasa, dholmes, erikj
 2014-09-16 16:02:32 +02:00
Vladimir Kozlov
b37ae217fa 8055503: Rollback 8054164 changeset 
Reviewed-by: iveresov
 2014-08-19 16:20:18 -07:00
Vladimir Kozlov
a94ab9c7a1 Merge 2014-08-19 17:48:16 +00:00
Vladimir Kozlov
89127c7360 8054164: solaris makefile 
Reviewed-by: roland
 2014-08-13 17:50:21 -07:00
Mike Duigou
99237ec5d9 8047952: Remove _FORTIFY_SOURCE from fastdebug and slowdebug builds 
Reviewed-by: dholmes
 2014-08-13 23:33:33 +00:00
Serguei Spitsyn
3dec185794 7187999: dtrace jstack action is broken 
Separate jhelper.d and hotspot provider (other USDT probes)

Reviewed-by: dholmes, dsamersoff
 2014-08-01 16:33:46 -07:00
Mike Duigou
412ab83d95 8046765: makefiles should use parameterized $(CP) and $(MV) rather than explicit commands 
Reviewed-by: kvn, dholmes
 2014-07-14 18:24:08 +00:00
Mike Duigou
f312adb9c5 8047734: Backout use of -Og 
Reviewed-by: iveresov
 2014-07-09 21:56:16 +00:00
Alejandro Murillo
b531babf09 8043541: 'fastdebug' is printed twice in java -version 
Reviewed-by: dholmes, dcubed, jcoomes
 2014-06-24 12:27:51 -07:00
Poonam Bajaj
754a598a62 8046282: SA update 
These changes add some definitions on the SA side and the supporting code on the hotspot side.

Reviewed-by: sundar, mgronlun
 2014-06-24 02:19:59 -07:00
Mike Duigou
ce91145032 8032045: Enable compiler and linker safety switches for debug builds 
Enable GCC linker protections, runtime bounds checks and stack protection.

Reviewed-by: dholmes, kvn, coleenp
 2014-06-12 16:31:07 -07:00
Coleen Phillimore
7bd17413f2 8015256: Better class accessibility 
Improve protection domain check in forName()

Reviewed-by: mchung, acorn, jdn
 2014-10-14 13:10:50 -07:00
Staffan Larsen
c1abf998a6 8041980: (hotspot) sun/jvmstat/monitor/MonitoredVm/CR6672135.java failing on all platforms 
Reviewed-by: mgronlun, kamg
 2014-04-28 09:27:47 +02:00
Alejandro Murillo
a162ea836e 8030011: Update Hotspot version string output 
Reviewed-by: dholmes, jcoomes, kvn
 2014-04-24 14:06:40 -07:00
Goetz Lindenmaier
4b9933a012 8036122: Fix warning 'format not a string literal' 
Reviewed-by: mduigou, kvn
 2014-03-03 11:54:35 +01:00
Mike Duigou
b633a889a7 8030350: Enable additional compiler warnings for GCC 
Reviewed-by: dholmes, coleenp, erikj, tbell, ihse
 2014-02-12 09:37:18 -08:00
Daniel D. Daugherty
3c5c0ddbce Merge 2014-02-10 12:58:53 -08:00
Ron Durbin
57d286084a 8005262: possible gamma launcher issues 
Cleaned out make targets and comments associated with the previously removed gamma launcher

Reviewed-by: dcubed, stefank
 2014-02-10 12:38:34 -08:00
Daniel D. Daugherty
62755b7358 8033714: hotspot 'install_jvm' bld target broken with ZIP_DEBUGINFO_FILES=0 
Fixed faulty logic in makefiles when compressed FDS builds are disabled

Reviewed-by: rdurbin, dholmes, never, dnsimon, tbell
 2014-02-07 09:03:44 -08:00
Staffan Larsen
eaac73cf84 8032462: Change the linux SDT implementation to use USDT2 instead of USDT1 
Reviewed-by: coleenp, sspitsyn, kamg
 2014-02-03 13:41:26 +01:00
Harold Seigel
b7100718e8 Merge 2014-01-29 19:54:44 -05:00
Henry Jen
5050fd5363 8028407: adjust-mflags.sh failed build with GNU Make 4.0 with -I<path contains j> 
Reviewed-by: erikj
 2014-01-21 20:07:14 -08:00
Staffan Larsen
b35fb5f8c0 8030812: Change the solaris DTrace implementation to use USDT2 instead of USDT1 
Reviewed-by: coleenp, sspitsyn, dsamersoff
 2014-01-16 20:14:21 +01:00
Morris Meyer
a665235538 Merge 2014-01-10 12:54:08 -08:00
Mikael Vidstedt
a0da47fd66 8029233: Update copyright year to match last edit in jdk8 hotspot repository for 2013 
Copyright year updated for files modified during 2013

Reviewed-by: twisti, iveresov
 2013-12-24 11:48:39 -08:00
Staffan Larsen
f72107ae20 8028737: Remove JVM_AccessVMIntFlag / JVM_AccessVMBooleanFlag / JVM_VMBreakPoint 
Reviewed-by: dcubed, coleenp
 2013-12-16 10:34:30 +01:00
Rickard Bäckman
8db7a08b50 Merge 2013-08-15 15:26:16 +02:00
Ioi Lam
617a84061c 8022093: syntax error near "umpiconninfo_t" -- when building on Solaris 10 
Added extra help message in make/solaris/makefiles/dtrace.make

Reviewed-by: dholmes, sspitsyn
 2013-08-08 14:45:56 -07:00
Niclas Adlertz
fc44cdf0ec 8022475: Remove unneeded ad-files 
Remove .ad files that are not used

Reviewed-by: kvn
 2013-08-07 18:04:42 +02:00
Eric Mccorkle
65405fd613 8014399: Remove JVM_SetProtectionDomain from hotspot 
JVM_SetProtectionDomain has been deprecated since 1.5 and is being removed

Reviewed-by: coleenp, hseigel
 2013-07-08 19:36:22 -04:00
Tao Mao
1ddf2378db 7122222: GC log is limited to 2G for 32-bit 
Enable large file support for generated 32-bit ostream.o on Linux and Solaris (as only the two need this) by setting -D_FILE_OFFSET_BITS=64 in compilation

Reviewed-by: tbell, mgerdin, dcubed
 2013-06-07 09:46:58 -07:00
Staffan Larsen
718f3252f6 8005849: JEP 167: Event-Based JVM Tracing 
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Bengt Rutisson <bengt.rutisson@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Co-authored-by: Erik Gahlin <erik.gahlin@oracle.com>
Co-authored-by: Erik Helin <erik.helin@oracle.com>
Co-authored-by: Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>
Co-authored-by: Keith McGuigan <keith.mcguigan@oracle.com>
Co-authored-by: Mattias Tobiasson <mattias.tobiasson@oracle.com>
Co-authored-by: Markus Gronlund <markus.gronlund@oracle.com>
Co-authored-by: Mikael Auno <mikael.auno@oracle.com>
Co-authored-by: Nils Eliasson <nils.eliasson@oracle.com>
Co-authored-by: Nils Loodin <nils.loodin@oracle.com>
Co-authored-by: Rickard Backman <rickard.backman@oracle.com>
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Reviewed-by: acorn, coleenp, sla
 2013-06-10 11:30:51 +02:00
Christian Thalinger
7c367a6025 8008772: remove gamma launcher 
Reviewed-by: kvn, neliasso, ctornqvi
 2013-05-06 19:49:23 -07:00
Niclas Adlertz
09fdc18edc 8011621: live_ranges_in_separate_class.patch 
Reviewed-by: kvn, roland
 2013-04-16 10:08:41 +02:00
David Chase
55c4ce1ca1 7104565: trim jprt build targets 
Remove JPRT debug builds, remove -DDEBUG -DFASTDEBUG and use ASSERT instead in sources

Reviewed-by: dholmes, kvn, coleenp
 2013-04-12 15:53:30 -07:00
Vladimir Kozlov
c68fa92e4b 8011198: LP64 setting is not preserved on Solaris after 8006965 
Fixed incremental build makefiles generated by buildtree.make. Consolidated unix build.sh.

Reviewed-by: twisti
 2013-04-04 12:18:46 -07:00
Joel Borggren-Franck
ee3ea81f65 8009382: Add JVM_Get{Field|Method}TypeAnnotations 
Reviewed-by: dcubed, rbackman
 2013-03-26 15:00:34 +01:00
Christian Thalinger
2f4ecb86a2 8006965: remove test_gamma and add dedicated test_* targets instead 
Reviewed-by: kvn, jcoomes
 2013-03-20 17:04:45 -07:00
Joseph Provino
94853afaee 8008474: Add -Wundef to warning flags 
Force use of undefined macros to be and error.

Reviewed-by: dholmes, mikael
 2013-03-06 13:50:54 -05:00
Mikael Gerdin
1d468be4b1 8006753: fix failed for JDK-8002415 White box testing API for HotSpot 
Modify WhiteBoxAPI to use interface classes from test/testlibrary instead, add ClassFileInstaller to resolve the boot class path issue

Reviewed-by: ctornqvi, dsamersoff, coleenp, kvn
 2013-02-19 18:45:49 +01:00
Mikael Vidstedt
d258e2c069 8007639: Workaround for ccache in vm.make is incorrect 
Fixed makefile logic to correctly special case JRE_RELEASE_VERSION and vm_version.o

Reviewed-by: dholmes, erikj
 2013-02-14 12:36:07 -08:00
Bharadwaj Yadavelli
cb255a0269 8004967: Default method cause VerifyError: Illegal use of nonvirtual 
Recognize VM generated method in old verifier

Reviewed-by: acorn, coleenp
 2013-01-28 10:55:30 -05:00
Zhengyu Gu
fc0efc91c8 8000692: Remove old KERNEL code 
Removed depreciated kernel VM source code from hotspot VM

Reviewed-by: dholmes, acorn
 2013-01-25 10:04:08 -05:00
Coleen Phillimore
e508ba9b0b 7174978: NPG: Fix bactrace builder for class redefinition 
Remove Method* from backtrace but save version so redefine classes doesn't give inaccurate line numbers.  Removed old Merlin API with duplicate code.

Reviewed-by: dholmes, sspitsyn
 2013-01-17 13:40:31 -05:00
Eric Mccorkle
be968245ec 8004728: Add hotspot support for parameter reflection 
Add hotspot support for parameter reflection

Reviewed-by: acorn, jrose, coleenp
 2013-01-08 14:01:36 -05:00
Joel Borggren-Franck
6ed6cb5375 8004823: Add VM support for type annotation reflection 
Reviewed-by: dholmes, coleenp
 2012-12-20 10:22:19 +01:00
Ron Durbin
af7cedec67 7153050: remove crufty '_g' support from HotSpot repo makefiles 
Phase 1 is removing '_g' support from the Makefiles.

Reviewed-by: dcubed, sspitsyn, coleenp, tbell
 2012-12-14 10:06:52 -08:00
David Holmes
40d5fa156c 8002034: Allow Full Debug Symbols when cross-compiling 
8001756: Hotspot makefiles report missing OBJCOPY command in the wrong circumstances

Reviewed-by: dcubed, dsamersoff, erikj, collins
 2012-11-05 19:33:44 -05:00
Vladimir Kozlov
5f132a5ec3 Merge 2012-10-12 09:22:52 -07:00
Mikael Vidstedt
769dd50182 7197424: update copyright year to match last edit in jdk8 hotspot repository 
Update copyright year to 2012 for relevant files

Reviewed-by: dholmes, coleenp
 2012-10-09 10:09:34 -07:00
Mark Wielaard
959d0a9ebb 7170638: Use DTRACE_PROBE[N] in JNI Set and SetStatic Field 
Don't use HS_DTRACE_PROBE_CDECL_N and HS_DTRACE_PROBE_N directly.

Reviewed-by: coleenp, kamg, dholmes, sspitsyn
 2012-10-08 09:18:54 -04:00
Vladimir Ivanov
2467d2f247 8000485: Hotspot build fails in Solaris Studio IDE when building dtrace 
Prepend '.' to the existing native library path

Reviewed-by: kvn, sspitsyn
 2012-10-05 19:44:49 -07:00
Yumin Qi
22544e7a7c 6879063: SA should use hsdis for disassembly 
We should in SA to use hsdis for it like the JVM does to replace the current java based disassembler.

Reviewed-by: twisti, jrose, sla
 2012-09-24 12:44:00 -07:00
Kelly O'Hair
f65906c1bc 7198329: Add $(sort) to object files used in links makes binarties more consistent 
Reviewed-by: dholmes, tbell, erikj, ihse, ohrstrom
 2012-09-18 13:15:28 -07:00
Magnus Ihse Bursie
b2b4d40c73 7172012: Make test-in-build an option (Queens) 
Reviewed-by: ohair, dholmes
 2012-09-17 11:46:25 -07:00
Vladimir Kozlov
f3b6368c39 7196167: NPG: mismerge in make/solaris/makefiles/fastdebug.make 
Remove the workaround of 7187454 problem which was restored incorrectly during NPG merge.

Reviewed-by: coleenp, dholmes
 2012-09-05 10:18:37 -07:00
Jon Masamitsu
5c58d27aac 6964458: Reimplement class meta-data storage to use native memory 
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes

Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com>
Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com>
Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
 2012-09-01 13:25:18 -04:00
Jiangli Zhou
338bf6e0b1 7187046: Crash in ClassFileParser on solaris-ia32 during RetransformClasses 
Lower compiler optimization level when compiling jvmtiClassFileReconstituter.cpp as a workaround for the solaris x86 5.10 cc bug.

Reviewed-by: kvn, coleenp
 2012-07-26 17:24:31 -04:00
Coleen Phillimore
135f315eaa Merge 2012-07-02 13:11:28 -04:00
Coleen Phillimore
9f400835df 7179759: ENV: Nightly fails during jdk copiyng for solaris platforms after FDS unzipping 
Libjvm_g_db.so and libjvm_g_dtrace.so links in .diz file still had 64 directory

Reviewed-by: kamg, dholmes, sspitsyn
 2012-06-29 14:28:10 -07:00
Zhengyu Gu
a39b17624a 6995781: Native Memory Tracking (Phase 1) 
7151532: DCmd for hotspot native memory tracking

Implementation of native memory tracking phase 1, which tracks VM native memory usage, and related DCmd

Reviewed-by: acorn, coleenp, fparain
 2012-06-28 17:03:16 -04:00
Daniel D. Daugherty
93e9a184a3 Merge 2012-06-20 14:29:23 -07:00
Daniel D. Daugherty
4189d0802f 7175255: symlinks are wrong, which caused jdk8-promote-2 to fail (client/64/64 directories in debuginfo zips) 
Fix bad paths in client/64 and server/64 debug info and symlink creation

Reviewed-by: ohair, dholmes
 2012-06-20 14:18:25 -07:00
Volker Simonis
7c17e9e75b 7175914: Usage of gcc with precompiled headers produces wrong build dependencies 
Add -fpch-deps flag to gcc builds

Reviewed-by: kamg, coleenp
 2012-06-11 13:10:14 -04:00
Daniel D. Daugherty
2003ef208a Merge 2012-05-24 12:57:01 -07:00
Daniel D. Daugherty
cad78d6f04 7165598: enable FDS on Solaris X64 when 7165593 is fixed 
Work around 'gobjcopy' failure on Solaris X64 by adding a temporary tool that removes the SHF_ALLOC flag from "empty" section headers.

Reviewed-by: sspitsyn, acorn
 2012-05-24 12:03:42 -07:00
Daniel D. Daugherty
aaf2d69944 7165060: dtrace tests fail with FDS debug info files 
Work around 'gobjcopy --add-gnu-debuglink' failure by adding a temporary tool that adds the '.gnu_debuglink' section and nothing more.

Reviewed-by: sspitsyn, acorn
 2012-05-15 10:52:24 -07:00
Daniel D. Daugherty
2d24f2ea0f Merge 2012-05-15 11:27:24 -07:00
Daniel D. Daugherty
5b91fbd2b5 7164344: enabling ZIP_DEBUGINFO_FILES causes unexpected test failures on Solaris and Windows 
Disable FDS by default on Solaris; disable ZIP_DEBUGINFO_FILES by default on Windows.

Reviewed-by: acorn, sspitsyn
 2012-04-25 15:06:51 -07:00
Daniel D. Daugherty
4ab089ddba Merge 2012-04-24 15:20:40 -07:00
Daniel D. Daugherty
6f5472dfe9 7158067: FDS: ENABLE_FULL_DEBUG_SYMBOLS flag should only affect product builds 
Build option FULL_DEBUG_SYMBOLS=0 only affects product builds.

Reviewed-by: ohair, jmelvin, sspitsyn
 2012-04-03 09:48:34 -07:00
Daniel D. Daugherty
86dac44dac 7102323: RFE: enable Full Debug Symbols Phase 1 on Solaris 
Add support for ENABLE_FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES build flags. Add support for .diz files.

Reviewed-by: dholmes, ohair, sspitsyn
 2012-03-23 11:50:33 -07:00
Nils Loodin
2c07f4154e 7148488: Whitebox tests for the Diagnostic Framework Parser 
Reviewed-by: brutisso, sla, mgerdin
 2012-03-15 13:37:13 +01:00
Erik Joelsson
cfc6c74d02 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built 
Reviewed-by: dholmes, ohair
 2012-03-19 10:09:24 +01:00
Bengt Rutisson
a77a5ac2a0 Merge 2012-03-05 22:34:18 +01:00
Mikael Gerdin
27c0786c3b 7148152: Add whitebox testing API to HotSpot 
Add an internal testing API to HotSpot to enable more targeted testing of vm functionality

Reviewed-by: phh, dholmes
 2012-02-23 14:58:35 +01:00
Erik Joelsson
97612e5913 7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable 
Reviewed-by: dholmes, ohrstrom, ohair, jcoomes
 2012-02-22 09:24:35 +01:00
Christian Thalinger
df753a2942 7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk 
Reviewed-by: rbackman, jrose, dholmes
 2012-02-13 04:30:59 -08:00
Erik Joelsson
a1b4a3f698 7141242: build-infra merge: Rename CPP->CXX and LINK->LD 
Cleaned up make variables for compilers and linker to consistently use CXX for C++ compiler, CC for C compiler and LD for linker.

Reviewed-by: dholmes, ohrstrom
 2012-02-06 09:14:22 +01:00
Fredrik Ohrstrom
301215b860 7132779: build-infra merge: Enable ccache to work for most developer builds 
When a build number is not specified, the JRE_RELEASE_VERSION define contains a date and timestamp. Thus ccache cannot cache the object files for longer than a minute since the define is passed to the compilation of all source files. This change passes JRE_RELEASE_VERSION only to vm_version.cpp and adds a function jre_release_version() to Abstract_VM_Version. This allows all other source files to be ccached.

Reviewed-by: ohair, rottenha
 2012-01-31 13:12:39 +01:00
James Melvin
ccf7d491f7 7125793: MAC: test_gamma should always work 
Fix gamma launcher on Mac OS X and reconcile test_gamma script on Unix platforms

Reviewed-by: dcubed, ohair, jcoomes, dholmes, ksrini
 2012-01-24 19:33:14 -05:00
Paul Hohensee
8efd785f67 Merge 2012-01-11 17:58:26 -05:00
Markus Gronlund
007126d010 7115199: Add event tracing hooks and Java Flight Recorder infrastructure 
Added a nop tracing infrastructure, JFR makefile changes and other infrastructure used only by JFR.

Reviewed-by: acorn, sspitsyn
 2012-01-11 17:34:02 -05:00
Vladimir Kozlov
dc542c9909 7121648: Use 3-operands SIMD instructions on x86 with AVX 
Use 3-operands SIMD instructions in C2 generated code for machines with AVX.

Reviewed-by: never
 2011-12-20 00:55:02 -08:00
Stefan Karlsson
78d7be03bf 7116081: USE_PRECOMPILED_HEADER=0 triggers a single threaded build of the JVM 
Changed the conditional to see if the precompiled header has been specified. Also, removed the unused PrecompiledOption.

Reviewed-by: dholmes, brutisso
 2011-11-28 14:58:31 +01:00
Michael McMahon
31933d1f8f 7116189: Export JVM_SetNativeThreadName from Hotspot 
Added JVM_SetNativeThreadName to linker mapfiles on Solaris and Linux.

Reviewed-by: dcubed, dholmes
 2011-11-29 09:21:02 -05:00
Rickard Backman
2c5cec930a 7106766: Move the precompiled header from the src/share/vm directory 
Moved precompiled.hpp to src/share/vm/precompiled

Reviewed-by: coleenp, dholmes
 2011-11-01 13:44:40 +01:00
Igor Veresov
7f01a4d4f5 Merge 2011-09-30 13:48:17 -07:00
Volker Simonis
812f619214 7096016: SA build still produces "arg list too long" errors 
Reviewed-by: kvn, never
 2011-09-29 13:47:57 -07:00