| 1 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
| 2 |
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| 3 |
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> |
| 4 |
<head> |
| 5 |
<title>rpms/java-1.8.0-openjdk.git - java-1.8.0-openjdk</title> |
| 6 |
<meta name='generator' content='cgit v0.12'/> |
| 7 |
<meta name='robots' content='index, nofollow'/> |
| 8 |
<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/> |
| 9 |
<link rel='shortcut icon' href='/favicon.ico'/> |
| 10 |
<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/atom/8049226-pr2960.patch?h=f24' type='application/atom+xml'/> |
| 11 |
<link rel='vcs-git' href='git://pkgs.fedoraproject.org/rpms/java-1.8.0-openjdk.git' title='rpms/java-1.8.0-openjdk.git Git repository'/> |
| 12 |
<link rel='vcs-git' href='ssh://pkgs.fedoraproject.org/rpms/java-1.8.0-openjdk.git' title='rpms/java-1.8.0-openjdk.git Git repository'/> |
| 13 |
<link rel='vcs-git' href='http://pkgs.fedoraproject.org/git/rpms/java-1.8.0-openjdk.git' title='rpms/java-1.8.0-openjdk.git Git repository'/> |
| 14 |
</head> |
| 15 |
<body> |
| 16 |
<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script> |
| 17 |
<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script> |
| 18 |
|
| 19 |
<script> |
| 20 |
var base = 'https://apps.fedoraproject.org/'; |
| 21 |
var tokens = window.location.href.split('/'); |
| 22 |
var repo = null; |
| 23 |
if (tokens.length > 4 && tokens[4] != '') { |
| 24 |
repo = tokens[4].split('.')[0]; |
| 25 |
} |
| 26 |
fedmenu({ |
| 27 |
'url': base + 'js/data.js', |
| 28 |
'mimeType': 'application/javascript', |
| 29 |
'position': 'bottom-right', |
| 30 |
'package': repo, |
| 31 |
}); |
| 32 |
</script> |
| 33 |
<div id='cgit'><table id='header'> |
| 34 |
<tr> |
| 35 |
<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td> |
| 36 |
<td class='main'><a href='/cgit/'>index</a> : <a title='rpms/java-1.8.0-openjdk.git' href='/cgit/rpms/java-1.8.0-openjdk.git/'>rpms/java-1.8.0-openjdk.git</a></td><td class='form'><form method='get' action=''> |
| 37 |
<select name='h' onchange='this.form.submit();'> |
| 38 |
<option value='f19'>f19</option> |
| 39 |
<option value='f20'>f20</option> |
| 40 |
<option value='f21'>f21</option> |
| 41 |
<option value='f22'>f22</option> |
| 42 |
<option value='f23'>f23</option> |
| 43 |
<option value='f24' selected='selected'>f24</option> |
| 44 |
<option value='f25'>f25</option> |
| 45 |
<option value='master'>master</option> |
| 46 |
</select> <input type='submit' name='' value='switch'/></form></td></tr> |
| 47 |
<tr><td class='sub'>java-1.8.0-openjdk</td><td class='sub right'>Jon Ciesla</td></tr></table> |
| 48 |
<table class='tabs'><tr><td> |
| 49 |
<a href='/cgit/rpms/java-1.8.0-openjdk.git/?h=f24'>summary</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/refs/?h=f24'>refs</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/log/8049226-pr2960.patch?h=f24'>log</a><a class='active' href='/cgit/rpms/java-1.8.0-openjdk.git/tree/8049226-pr2960.patch?h=f24'>tree</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/commit/8049226-pr2960.patch?h=f24'>commit</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/diff/8049226-pr2960.patch?h=f24'>diff</a><a href='/cgit/rpms/java-1.8.0-openjdk.git/stats/8049226-pr2960.patch?h=f24'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/rpms/java-1.8.0-openjdk.git/log/8049226-pr2960.patch'> |
| 50 |
<input type='hidden' name='h' value='f24'/><select name='qt'> |
| 51 |
<option value='grep'>log msg</option> |
| 52 |
<option value='author'>author</option> |
| 53 |
<option value='committer'>committer</option> |
| 54 |
<option value='range'>range</option> |
| 55 |
</select> |
| 56 |
<input class='txt' type='text' size='10' name='q' value=''/> |
| 57 |
<input type='submit' value='search'/> |
| 58 |
</form> |
| 59 |
</td></tr></table> |
| 60 |
<div class='path'>path: <a href='/cgit/rpms/java-1.8.0-openjdk.git/tree/?h=f24'>root</a>/<a href='/cgit/rpms/java-1.8.0-openjdk.git/tree/8049226-pr2960.patch?h=f24'>8049226-pr2960.patch</a></div><div class='content'>blob: 0f6bdf8ca3544f579d0d136629086989d2b2189b (<a href='/cgit/rpms/java-1.8.0-openjdk.git/plain/8049226-pr2960.patch?h=f24'>plain</a>) |
| 61 |
<table summary='blob content' class='blob'> |
| 62 |
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> |
| 63 |
<a id='n2' href='#n2'>2</a> |
| 64 |
<a id='n3' href='#n3'>3</a> |
| 65 |
<a id='n4' href='#n4'>4</a> |
| 66 |
<a id='n5' href='#n5'>5</a> |
| 67 |
<a id='n6' href='#n6'>6</a> |
| 68 |
<a id='n7' href='#n7'>7</a> |
| 69 |
<a id='n8' href='#n8'>8</a> |
| 70 |
<a id='n9' href='#n9'>9</a> |
| 71 |
<a id='n10' href='#n10'>10</a> |
| 72 |
<a id='n11' href='#n11'>11</a> |
| 73 |
<a id='n12' href='#n12'>12</a> |
| 74 |
<a id='n13' href='#n13'>13</a> |
| 75 |
<a id='n14' href='#n14'>14</a> |
| 76 |
<a id='n15' href='#n15'>15</a> |
| 77 |
<a id='n16' href='#n16'>16</a> |
| 78 |
<a id='n17' href='#n17'>17</a> |
| 79 |
<a id='n18' href='#n18'>18</a> |
| 80 |
<a id='n19' href='#n19'>19</a> |
| 81 |
<a id='n20' href='#n20'>20</a> |
| 82 |
<a id='n21' href='#n21'>21</a> |
| 83 |
<a id='n22' href='#n22'>22</a> |
| 84 |
<a id='n23' href='#n23'>23</a> |
| 85 |
<a id='n24' href='#n24'>24</a> |
| 86 |
<a id='n25' href='#n25'>25</a> |
| 87 |
<a id='n26' href='#n26'>26</a> |
| 88 |
<a id='n27' href='#n27'>27</a> |
| 89 |
<a id='n28' href='#n28'>28</a> |
| 90 |
<a id='n29' href='#n29'>29</a> |
| 91 |
<a id='n30' href='#n30'>30</a> |
| 92 |
<a id='n31' href='#n31'>31</a> |
| 93 |
<a id='n32' href='#n32'>32</a> |
| 94 |
<a id='n33' href='#n33'>33</a> |
| 95 |
<a id='n34' href='#n34'>34</a> |
| 96 |
<a id='n35' href='#n35'>35</a> |
| 97 |
<a id='n36' href='#n36'>36</a> |
| 98 |
<a id='n37' href='#n37'>37</a> |
| 99 |
<a id='n38' href='#n38'>38</a> |
| 100 |
<a id='n39' href='#n39'>39</a> |
| 101 |
<a id='n40' href='#n40'>40</a> |
| 102 |
<a id='n41' href='#n41'>41</a> |
| 103 |
<a id='n42' href='#n42'>42</a> |
| 104 |
<a id='n43' href='#n43'>43</a> |
| 105 |
<a id='n44' href='#n44'>44</a> |
| 106 |
<a id='n45' href='#n45'>45</a> |
| 107 |
<a id='n46' href='#n46'>46</a> |
| 108 |
<a id='n47' href='#n47'>47</a> |
| 109 |
<a id='n48' href='#n48'>48</a> |
| 110 |
<a id='n49' href='#n49'>49</a> |
| 111 |
<a id='n50' href='#n50'>50</a> |
| 112 |
<a id='n51' href='#n51'>51</a> |
| 113 |
<a id='n52' href='#n52'>52</a> |
| 114 |
<a id='n53' href='#n53'>53</a> |
| 115 |
<a id='n54' href='#n54'>54</a> |
| 116 |
<a id='n55' href='#n55'>55</a> |
| 117 |
<a id='n56' href='#n56'>56</a> |
| 118 |
<a id='n57' href='#n57'>57</a> |
| 119 |
<a id='n58' href='#n58'>58</a> |
| 120 |
<a id='n59' href='#n59'>59</a> |
| 121 |
<a id='n60' href='#n60'>60</a> |
| 122 |
<a id='n61' href='#n61'>61</a> |
| 123 |
<a id='n62' href='#n62'>62</a> |
| 124 |
<a id='n63' href='#n63'>63</a> |
| 125 |
<a id='n64' href='#n64'>64</a> |
| 126 |
<a id='n65' href='#n65'>65</a> |
| 127 |
<a id='n66' href='#n66'>66</a> |
| 128 |
<a id='n67' href='#n67'>67</a> |
| 129 |
<a id='n68' href='#n68'>68</a> |
| 130 |
<a id='n69' href='#n69'>69</a> |
| 131 |
<a id='n70' href='#n70'>70</a> |
| 132 |
<a id='n71' href='#n71'>71</a> |
| 133 |
<a id='n72' href='#n72'>72</a> |
| 134 |
<a id='n73' href='#n73'>73</a> |
| 135 |
<a id='n74' href='#n74'>74</a> |
| 136 |
<a id='n75' href='#n75'>75</a> |
| 137 |
<a id='n76' href='#n76'>76</a> |
| 138 |
<a id='n77' href='#n77'>77</a> |
| 139 |
<a id='n78' href='#n78'>78</a> |
| 140 |
<a id='n79' href='#n79'>79</a> |
| 141 |
<a id='n80' href='#n80'>80</a> |
| 142 |
<a id='n81' href='#n81'>81</a> |
| 143 |
<a id='n82' href='#n82'>82</a> |
| 144 |
<a id='n83' href='#n83'>83</a> |
| 145 |
<a id='n84' href='#n84'>84</a> |
| 146 |
<a id='n85' href='#n85'>85</a> |
| 147 |
<a id='n86' href='#n86'>86</a> |
| 148 |
<a id='n87' href='#n87'>87</a> |
| 149 |
<a id='n88' href='#n88'>88</a> |
| 150 |
<a id='n89' href='#n89'>89</a> |
| 151 |
<a id='n90' href='#n90'>90</a> |
| 152 |
<a id='n91' href='#n91'>91</a> |
| 153 |
<a id='n92' href='#n92'>92</a> |
| 154 |
<a id='n93' href='#n93'>93</a> |
| 155 |
<a id='n94' href='#n94'>94</a> |
| 156 |
<a id='n95' href='#n95'>95</a> |
| 157 |
<a id='n96' href='#n96'>96</a> |
| 158 |
<a id='n97' href='#n97'>97</a> |
| 159 |
<a id='n98' href='#n98'>98</a> |
| 160 |
<a id='n99' href='#n99'>99</a> |
| 161 |
<a id='n100' href='#n100'>100</a> |
| 162 |
<a id='n101' href='#n101'>101</a> |
| 163 |
<a id='n102' href='#n102'>102</a> |
| 164 |
<a id='n103' href='#n103'>103</a> |
| 165 |
<a id='n104' href='#n104'>104</a> |
| 166 |
<a id='n105' href='#n105'>105</a> |
| 167 |
<a id='n106' href='#n106'>106</a> |
| 168 |
<a id='n107' href='#n107'>107</a> |
| 169 |
<a id='n108' href='#n108'>108</a> |
| 170 |
<a id='n109' href='#n109'>109</a> |
| 171 |
<a id='n110' href='#n110'>110</a> |
| 172 |
<a id='n111' href='#n111'>111</a> |
| 173 |
<a id='n112' href='#n112'>112</a> |
| 174 |
<a id='n113' href='#n113'>113</a> |
| 175 |
<a id='n114' href='#n114'>114</a> |
| 176 |
<a id='n115' href='#n115'>115</a> |
| 177 |
<a id='n116' href='#n116'>116</a> |
| 178 |
<a id='n117' href='#n117'>117</a> |
| 179 |
<a id='n118' href='#n118'>118</a> |
| 180 |
<a id='n119' href='#n119'>119</a> |
| 181 |
<a id='n120' href='#n120'>120</a> |
| 182 |
<a id='n121' href='#n121'>121</a> |
| 183 |
<a id='n122' href='#n122'>122</a> |
| 184 |
<a id='n123' href='#n123'>123</a> |
| 185 |
</pre></td> |
| 186 |
<td class='lines'><pre><code># HG changeset patch |
| 187 |
# User dsamersoff |
| 188 |
# Date 1409228402 25200 |
| 189 |
# Thu Aug 28 05:20:02 2014 -0700 |
| 190 |
# Node ID f4c9545cd8a56a5fab74c95de3573623ba2b83c4 |
| 191 |
# Parent 13411144d46b50d0087f35eca2b8e827aae558f1 |
| 192 |
8049226, PR2960: com/sun/jdi/OptionTest.java test times out again |
| 193 |
Summary: Don't call jni_FatalError if transport initialization fails |
| 194 |
Reviewed-by: sspitsyn, sla |
| 195 |
|
| 196 |
diff -r 13411144d46b -r f4c9545cd8a5 src/share/back/debugInit.c |
| 197 |
--- openjdk/jdk/src/share/back/debugInit.c Wed Jun 18 03:29:58 2014 -0700 |
| 198 |
+++ openjdk/jdk/src/share/back/debugInit.c Thu Aug 28 05:20:02 2014 -0700 |
| 199 |
@@ -1013,7 +1013,7 @@ |
| 200 |
atexit_finish_logging(void) |
| 201 |
{ |
| 202 |
/* Normal exit(0) (not _exit()) may only reach here */ |
| 203 |
- finish_logging(0); /* Only first call matters */ |
| 204 |
+ finish_logging(); /* Only first call matters */ |
| 205 |
} |
| 206 |
|
| 207 |
static jboolean |
| 208 |
@@ -1301,43 +1301,49 @@ |
| 209 |
void |
| 210 |
debugInit_exit(jvmtiError error, const char *msg) |
| 211 |
{ |
| 212 |
- int exit_code = 0; |
| 213 |
+ enum exit_codes { EXIT_NO_ERRORS = 0, EXIT_JVMTI_ERROR = 1, EXIT_TRANSPORT_ERROR = 2 }; |
| 214 |
|
| 215 |
- /* Pick an error code */ |
| 216 |
- if ( error != JVMTI_ERROR_NONE ) { |
| 217 |
- exit_code = 1; |
| 218 |
- if ( docoredump ) { |
| 219 |
- LOG_MISC(("Dumping core as requested by command line")); |
| 220 |
- finish_logging(exit_code); |
| 221 |
- abort(); |
| 222 |
- } |
| 223 |
+ // Prepare to exit. Log error and finish logging |
| 224 |
+ LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error, |
| 225 |
+ ((msg == NULL) ? "" : msg))); |
| 226 |
+ |
| 227 |
+ // coredump requested by command line. Keep JVMTI data dirty |
| 228 |
+ if (error != JVMTI_ERROR_NONE && docoredump) { |
| 229 |
+ LOG_MISC(("Dumping core as requested by command line")); |
| 230 |
+ finish_logging(); |
| 231 |
+ abort(); |
| 232 |
} |
| 233 |
|
| 234 |
- if ( msg==NULL ) { |
| 235 |
- msg = ""; |
| 236 |
- } |
| 237 |
+ finish_logging(); |
| 238 |
|
| 239 |
- LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error, msg)); |
| 240 |
- |
| 241 |
+ // Cleanup the JVMTI if we have one |
| 242 |
if (gdata != NULL) { |
| 243 |
gdata->vmDead = JNI_TRUE; |
| 244 |
- |
| 245 |
- /* Let's try and cleanup the JVMTI, if we even have one */ |
| 246 |
- if ( gdata->jvmti != NULL ) { |
| 247 |
- /* Dispose of jvmti (gdata->jvmti becomes NULL) */ |
| 248 |
+ if (gdata->jvmti != NULL) { |
| 249 |
+ // Dispose of jvmti (gdata->jvmti becomes NULL) |
| 250 |
disposeEnvironment(gdata->jvmti); |
| 251 |
} |
| 252 |
} |
| 253 |
|
| 254 |
- /* Finish up logging. We reach here if JDWP is doing the exiting. */ |
| 255 |
- finish_logging(exit_code); /* Only first call matters */ |
| 256 |
- |
| 257 |
- /* Let's give the JNI a FatalError if non-exit 0, which is historic way */ |
| 258 |
- if ( exit_code != 0 ) { |
| 259 |
- JNIEnv *env = NULL; |
| 260 |
- jniFatalError(env, msg, error, exit_code); |
| 261 |
+ // We are here with no errors. Kill entire process and exit with zero exit code |
| 262 |
+ if (error == JVMTI_ERROR_NONE) { |
| 263 |
+ forceExit(EXIT_NO_ERRORS); |
| 264 |
+ return; |
| 265 |
} |
| 266 |
|
| 267 |
- /* Last chance to die, this kills the entire process. */ |
| 268 |
- forceExit(exit_code); |
| 269 |
+ // No transport initilized. |
| 270 |
+ // As we don't have any details here exiting with separate exit code |
| 271 |
+ if (error == AGENT_ERROR_TRANSPORT_INIT) { |
| 272 |
+ forceExit(EXIT_TRANSPORT_ERROR); |
| 273 |
+ return; |
| 274 |
+ } |
| 275 |
+ |
| 276 |
+ // We have JVMTI error. Call hotspot jni_FatalError handler |
| 277 |
+ jniFatalError(NULL, msg, error, EXIT_JVMTI_ERROR); |
| 278 |
+ |
| 279 |
+ // hotspot calls os:abort() so we should never reach code below, |
| 280 |
+ // but guard against possible hotspot changes |
| 281 |
+ |
| 282 |
+ // Last chance to die, this kills the entire process. |
| 283 |
+ forceExit(EXIT_JVMTI_ERROR); |
| 284 |
} |
| 285 |
diff -r 13411144d46b -r f4c9545cd8a5 src/share/back/log_messages.c |
| 286 |
--- openjdk/jdk/src/share/back/log_messages.c Wed Jun 18 03:29:58 2014 -0700 |
| 287 |
+++ openjdk/jdk/src/share/back/log_messages.c Thu Aug 28 05:20:02 2014 -0700 |
| 288 |
@@ -230,7 +230,7 @@ |
| 289 |
|
| 290 |
/* Finish up logging, flush output to the logfile. */ |
| 291 |
void |
| 292 |
-finish_logging(int exit_code) |
| 293 |
+finish_logging() |
| 294 |
{ |
| 295 |
#ifdef JDWP_LOGGING |
| 296 |
MUTEX_LOCK(my_mutex); |
| 297 |
diff -r 13411144d46b -r f4c9545cd8a5 src/share/back/log_messages.h |
| 298 |
--- openjdk/jdk/src/share/back/log_messages.h Wed Jun 18 03:29:58 2014 -0700 |
| 299 |
+++ openjdk/jdk/src/share/back/log_messages.h Thu Aug 28 05:20:02 2014 -0700 |
| 300 |
@@ -29,7 +29,7 @@ |
| 301 |
/* LOG: Must be called like: LOG_category(("anything")) or LOG_category((format,args)) */ |
| 302 |
|
| 303 |
void setup_logging(const char *, unsigned); |
| 304 |
-void finish_logging(int); |
| 305 |
+void finish_logging(); |
| 306 |
|
| 307 |
#define LOG_NULL ((void)0) |
| 308 |
|
| 309 |
</code></pre></td></tr></table> |
| 310 |
</div> <!-- class=content --> |
| 311 |
<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2016-07-28 17:00:59 (GMT)</div> |
| 312 |
</div> <!-- id=cgit --> |
| 313 |
</body> |
| 314 |
</html> |
Parent Directory
| 
Revision Log