ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.127 by root, Wed Jan 3 00:05:26 2007 UTC vs.
Revision 1.140 by root, Fri Jan 5 20:04:02 2007 UTC

… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 184=item cf::lock_wait $string
209 185
210Wait until the given lock is available. See cf::lock_acquire. 186Wait until the given lock is available. See cf::lock_acquire.
211 187
212=item my $lock = cf::lock_acquire $string 188=item my $lock = cf::lock_acquire $string
213 189
214Wait until the given lock is available and then acquires it and returns 190Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 192for example when the coroutine gets canceled), the lock is automatically
217returned. 193returned.
218 194
219Lock names should begin with a unique identifier (for example, find_map 195Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 196uses map_find and cf::map::load uses map_load).
221 197
222=cut 198=cut
223 199
224our %LOCK; 200our %LOCK;
225 201
… …
239 # wait, to be sure we are not locked 215 # wait, to be sure we are not locked
240 lock_wait $key; 216 lock_wait $key;
241 217
242 $LOCK{$key} = []; 218 $LOCK{$key} = [];
243 219
244 cf::guard { 220 Coro::guard {
245 # wake up all waiters, to be on the safe side 221 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 222 $_->ready for @{ delete $LOCK{$key} };
247 } 223 }
248} 224}
249 225
226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
228
229 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop;
231 $guard
232}
233
250=item cf::async { BLOCK } 234=item cf::async { BLOCK }
251 235
252Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 236Currently the same as Coro::async_pool, meaning you cannot use
253error instead of exiting the server in case of a problem. 237C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
238thing you are allowed to do is call C<prio> on it.
254 239
255=cut 240=cut
256 241
257sub async(&) { 242BEGIN { *async = \&Coro::async_pool }
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265 243
266=item cf::sync_job { BLOCK } 244=item cf::sync_job { BLOCK }
267 245
268The design of crossfire+ requires that the main coro ($Coro::main) is 246The design of crossfire+ requires that the main coro ($Coro::main) is
269always able to handle events or runnable, as crossfire+ is only partly 247always able to handle events or runnable, as crossfire+ is only partly
… …
283 # this is the main coro, too bad, we have to block 261 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 262 # till the operation succeeds, freezing the server :/
285 263
286 # TODO: use suspend/resume instead 264 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 265 # (but this is cancel-safe)
288 local $FREEZE = 1; 266 my $freeze_guard = freeze_mainloop;
289 267
290 my $busy = 1; 268 my $busy = 1;
291 my @res; 269 my @res;
292 270
293 (Coro::async { 271 (async {
294 @res = eval { $job->() }; 272 @res = eval { $job->() };
295 warn $@ if $@; 273 warn $@ if $@;
296 undef $busy; 274 undef $busy;
297 })->prio (Coro::PRIO_MAX); 275 })->prio (Coro::PRIO_MAX);
298 276
299 while ($busy) { 277 while ($busy) {
300 Coro::cede_notself; 278 unless (Coro::cede) {
301 Event::one_event unless Coro::nready; 279 Coro::nready ? Event::one_event 0 : Event::one_event;
280 Coro::cede_notself unless Coro::cede;
281 }
302 } 282 }
303 283
304 wantarray ? @res : $res[0] 284 wantarray ? @res : $res[0]
305 } else { 285 } else {
306 # we are in another coroutine, how wonderful, everything just works 286 # we are in another coroutine, how wonderful, everything just works
307 287
308 $job->() 288 $job->()
309 } 289 }
310} 290}
311 291
312=item $coro = cf::coro { BLOCK } 292=item $coro = cf::async_ext { BLOCK }
313 293
314Creates and returns a new coro. This coro is automcatially being canceled 294Like async, but this coro is automcatially being canceled when the
315when the extension calling this is being unloaded. 295extension calling this is being unloaded.
316 296
317=cut 297=cut
318 298
319sub coro(&) { 299sub async_ext(&) {
320 my $cb = shift; 300 my $cb = shift;
321 301
322 my $coro = &cf::async ($cb); 302 my $coro = &Coro::async ($cb);
323 303
324 $coro->on_destroy (sub { 304 $coro->on_destroy (sub {
325 delete $EXT_CORO{$coro+0}; 305 delete $EXT_CORO{$coro+0};
326 }); 306 });
327 $EXT_CORO{$coro+0} = $coro; 307 $EXT_CORO{$coro+0} = $coro;
… …
1137package cf::map; 1117package cf::map;
1138 1118
1139use Fcntl; 1119use Fcntl;
1140use Coro::AIO; 1120use Coro::AIO;
1141 1121
1142our $MAX_RESET = 7200; 1122our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1123our $DEFAULT_RESET = 3000;
1144 1124
1145sub generate_random_map { 1125sub generate_random_map {
1146 my ($path, $rmp) = @_; 1126 my ($path, $rmp) = @_;
1147 1127
1148 # mit "rum" bekleckern, nicht 1128 # mit "rum" bekleckern, nicht
… …
1178 or return; 1158 or return;
1179 1159
1180 my $map = cf::map::new 1160 my $map = cf::map::new
1181 or return; 1161 or return;
1182 1162
1163 # for better error messages only, will be overwritten
1164 $map->path ($path);
1165
1183 $map->load_header ($path) 1166 $map->load_header ($path)
1184 or return; 1167 or return;
1185 1168
1186 $map->{load_path} = $path; 1169 $map->{load_path} = $path;
1187 1170
1188 $map 1171 $map
1189} 1172}
1190 1173
1191sub find_map; 1174sub find;
1192sub find_map { 1175sub find {
1193 my ($path, $origin) = @_; 1176 my ($path, $origin) = @_;
1194 1177
1195 #warn "find_map<$path,$origin>\n";#d# 1178 #warn "find<$path,$origin>\n";#d#
1196 1179
1197 $path = new cf::path $path, $origin && $origin->path; 1180 $path = new cf::path $path, $origin && $origin->path;
1198 my $key = $path->as_string; 1181 my $key = $path->as_string;
1199 1182
1200 cf::lock_wait "map_find:$key"; 1183 cf::lock_wait "map_find:$key";
… …
1203 my $guard = cf::lock_acquire "map_find:$key"; 1186 my $guard = cf::lock_acquire "map_find:$key";
1204 1187
1205 # do it the slow way 1188 # do it the slow way
1206 my $map = try_load_header $path->save_path; 1189 my $map = try_load_header $path->save_path;
1207 1190
1191 Coro::cede;
1192
1208 if ($map) { 1193 if ($map) {
1194 $map->last_access ((delete $map->{last_access})
1195 || $cf::RUNTIME); #d#
1209 # safety 1196 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME 1197 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME; 1198 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else { 1199 } else {
1213 if (my $rmp = $path->random_map_params) { 1200 if (my $rmp = $path->random_map_params) {
… …
1218 1205
1219 $map or return; 1206 $map or return;
1220 1207
1221 $map->{load_original} = 1; 1208 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME; 1209 $map->{instantiate_time} = $cf::RUNTIME;
1210 $map->last_access ($cf::RUNTIME);
1223 $map->instantiate; 1211 $map->instantiate;
1224 1212
1225 # per-player maps become, after loading, normal maps 1213 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel}; 1214 $map->per_player (0) if $path->{user_rel};
1227 } 1215 }
1228 1216
1229 $map->path ($key); 1217 $map->path ($key);
1230 $map->{path} = $path; 1218 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1219 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1220
1221 Coro::cede;
1233 1222
1234 if ($map->should_reset) { 1223 if ($map->should_reset) {
1235 $map->reset; 1224 $map->reset;
1236 undef $guard; 1225 undef $guard;
1237 $map = find_map $path 1226 $map = find $path
1238 or return; 1227 or return;
1239 } 1228 }
1240 1229
1241 $cf::MAP{$key} = $map 1230 $cf::MAP{$key} = $map
1242 } 1231 }
… …
1264 if (aio_open $uniq, O_RDONLY, 0) { 1253 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1254 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1255 $self->load_objects ($uniq, 0);
1267 } 1256 }
1268 } 1257 }
1258
1259 Coro::cede;
1269 1260
1270 # now do the right thing for maps 1261 # now do the right thing for maps
1271 $self->link_multipart_objects; 1262 $self->link_multipart_objects;
1272 1263
1273 if ($self->{path}->is_style_map) { 1264 if ($self->{path}->is_style_map) {
… …
1281 $self->difficulty ($self->estimate_difficulty) 1272 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1273 unless $self->difficulty;
1283 $self->activate; 1274 $self->activate;
1284 } 1275 }
1285 1276
1277 Coro::cede;
1278
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1279 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1280}
1288 1281
1289sub load_map_sync { 1282sub find_sync {
1290 my ($path, $origin) = @_; 1283 my ($path, $origin) = @_;
1291 1284
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1285 cf::sync_job { cf::map::find $path, $origin }
1286}
1293 1287
1294 cf::sync_job { 1288sub do_load_sync {
1295 my $map = cf::map::find_map $path, $origin 1289 my ($map) = @_;
1296 or return; 1290
1297 $map->load; 1291 cf::sync_job { $map->load };
1298 $map
1299 }
1300} 1292}
1301 1293
1302sub save { 1294sub save {
1303 my ($self) = @_; 1295 my ($self) = @_;
1304 1296
1297 my $lock = cf::lock_acquire "map_data:" . $self->path;
1298
1305 $self->{last_save} = $cf::RUNTIME; 1299 $self->{last_save} = $cf::RUNTIME;
1306 1300
1307 return unless $self->dirty; 1301 return unless $self->dirty;
1308 1302
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1303 my $save = $self->{path}->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1304 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311 1305
1312 $self->{load_path} = $save; 1306 $self->{load_path} = $save;
1313 1307
1314 return if $self->{deny_save}; 1308 return if $self->{deny_save};
1309
1310 local $self->{last_access} = $self->last_access;#d#
1315 1311
1316 if ($uniq) { 1312 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1314 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1315 } else {
… …
1322} 1318}
1323 1319
1324sub swap_out { 1320sub swap_out {
1325 my ($self) = @_; 1321 my ($self) = @_;
1326 1322
1323 # save first because save cedes
1324 $self->save;
1325
1326 my $lock = cf::lock_acquire "map_data:" . $self->path;
1327
1327 return if $self->players; 1328 return if $self->players;
1328 return if $self->in_memory != cf::MAP_IN_MEMORY; 1329 return if $self->in_memory != cf::MAP_IN_MEMORY;
1329 return if $self->{deny_save}; 1330 return if $self->{deny_save};
1330 1331
1331 $self->save;
1332 $self->clear; 1332 $self->clear;
1333 $self->in_memory (cf::MAP_SWAPPED); 1333 $self->in_memory (cf::MAP_SWAPPED);
1334} 1334}
1335 1335
1336sub reset_at { 1336sub reset_at {
… …
1374} 1374}
1375 1375
1376sub reset { 1376sub reset {
1377 my ($self) = @_; 1377 my ($self) = @_;
1378 1378
1379 my $lock = cf::lock_acquire "map_data:" . $self->path;
1380
1379 return if $self->players; 1381 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1382 return if $self->{path}{user_rel};#d#
1381 1383
1382 warn "resetting map ", $self->path;#d# 1384 warn "resetting map ", $self->path;#d#
1383 1385
… …
1402 1404
1403sub customise_for { 1405sub customise_for {
1404 my ($map, $ob) = @_; 1406 my ($map, $ob) = @_;
1405 1407
1406 if ($map->per_player) { 1408 if ($map->per_player) {
1407 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1409 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1408 } 1410 }
1409 1411
1410 $map 1412 $map
1411} 1413}
1412 1414
1413sub emergency_save { 1415sub emergency_save {
1414 local $cf::FREEZE = 1; 1416 my $freeze_guard = cf::freeze_mainloop;
1415 1417
1416 warn "enter emergency map save\n"; 1418 warn "enter emergency map save\n";
1417 1419
1418 cf::sync_job { 1420 cf::sync_job {
1419 warn "begin emergency map save\n"; 1421 warn "begin emergency map save\n";
… …
1509 my $link_pos = delete $self->{_link_pos}; 1511 my $link_pos = delete $self->{_link_pos};
1510 1512
1511 unless ($map) { 1513 unless ($map) {
1512 # restore original map position 1514 # restore original map position
1513 ($map, $x, $y) = @{ $link_pos || [] }; 1515 ($map, $x, $y) = @{ $link_pos || [] };
1514 $map = cf::map::find_map $map; 1516 $map = cf::map::find $map;
1515 1517
1516 unless ($map) { 1518 unless ($map) {
1517 ($map, $x, $y) = @$EMERGENCY_POSITION; 1519 ($map, $x, $y) = @$EMERGENCY_POSITION;
1518 $map = cf::map::find_map $map 1520 $map = cf::map::find $map
1519 or die "FATAL: cannot load emergency map\n"; 1521 or die "FATAL: cannot load emergency map\n";
1520 } 1522 }
1521 } 1523 }
1522 1524
1523 ($x, $y) = (-1, -1) 1525 ($x, $y) = (-1, -1)
… …
1548 my ($pl) = @_; 1550 my ($pl) = @_;
1549 1551
1550 # try to abort aborted map switching on player login :) 1552 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1553 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1554 if ($pl->ob->{_link_pos}) {
1555
1553 $pl->ob->enter_link; 1556 $pl->ob->enter_link;
1554 cf::async { 1557 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1558 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1559 # and this sleep increases chances of the player not ending up in scorn
1560 $pl->ob->reply (undef,
1561 "There was an internal problem at your last logout, "
1562 . "the server will try to bring you to your intended destination in a second.",
1563 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1564 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1565 $pl->ob->leave_link;
1559 }; 1566 })->prio (2);
1560 } 1567 }
1561 }, 1568 },
1562); 1569);
1563 1570
1564=item $player_object->goto_map ($path, $x, $y) 1571=item $player_object->goto ($path, $x, $y)
1565 1572
1566=cut 1573=cut
1567 1574
1568sub cf::object::player::goto_map { 1575sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1576 my ($self, $path, $x, $y) = @_;
1570 1577
1571 $self->enter_link; 1578 $self->enter_link;
1572 1579
1573 (cf::async { 1580 (async {
1574 $path = new cf::path $path; 1581 $path = new cf::path $path;
1575 1582
1576 my $map = cf::map::find_map $path->as_string; 1583 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1584 $map = $map->customise_for ($self) if $map;
1578 1585
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1586# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1587# if $map;
1581 1588
… …
1640 1647
1641 return unless $self->type == cf::PLAYER; 1648 return unless $self->type == cf::PLAYER;
1642 1649
1643 $self->enter_link; 1650 $self->enter_link;
1644 1651
1645 (cf::async { 1652 (async {
1653 $self->deactivate_recursive; # just to be sure
1646 unless (eval { 1654 unless (eval {
1647 prepare_random_map $exit 1655 prepare_random_map $exit
1648 if $exit->slaying eq "/!"; 1656 if $exit->slaying eq "/!";
1649 1657
1650 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1658 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1651 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1659 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1652 1660
1653 1; 1661 1;
1654 }) { 1662 }) {
1655 $self->message ("Something went wrong deep within the crossfire server. " 1663 $self->message ("Something went wrong deep within the crossfire server. "
1656 . "I'll try to bring you back to the map you were before. " 1664 . "I'll try to bring you back to the map you were before. "
… …
1713 on_reply => sub { 1721 on_reply => sub {
1714 my ($ns, $msg) = @_; 1722 my ($ns, $msg) = @_;
1715 1723
1716 # this weird shuffling is so that direct followup queries 1724 # this weird shuffling is so that direct followup queries
1717 # get handled first 1725 # get handled first
1718 my $queue = delete $ns->{query_queue}; 1726 my $queue = delete $ns->{query_queue}
1727 or return; # be conservative, not sure how that can happen, but we saw a crash here
1719 1728
1720 (shift @$queue)->[1]->($msg); 1729 (shift @$queue)->[1]->($msg);
1721 1730
1722 push @{ $ns->{query_queue} }, @$queue; 1731 push @{ $ns->{query_queue} }, @$queue;
1723 1732
… …
1729 } 1738 }
1730 } 1739 }
1731 }, 1740 },
1732); 1741);
1733 1742
1734=item $client->coro (\&cb) 1743=item $client->async (\&cb)
1735 1744
1736Create a new coroutine, running the specified callback. The coroutine will 1745Create a new coroutine, running the specified callback. The coroutine will
1737be automatically cancelled when the client gets destroyed (e.g. on logout, 1746be automatically cancelled when the client gets destroyed (e.g. on logout,
1738or loss of connection). 1747or loss of connection).
1739 1748
1740=cut 1749=cut
1741 1750
1742sub cf::client::coro { 1751sub cf::client::async {
1743 my ($self, $cb) = @_; 1752 my ($self, $cb) = @_;
1744 1753
1745 my $coro = &cf::async ($cb); 1754 my $coro = &Coro::async ($cb);
1746 1755
1747 $coro->on_destroy (sub { 1756 $coro->on_destroy (sub {
1748 delete $self->{_coro}{$coro+0}; 1757 delete $self->{_coro}{$coro+0};
1749 }); 1758 });
1750 1759
… …
1985 open my $fh, "<:utf8", cf::confdir . "/config" 1994 open my $fh, "<:utf8", cf::confdir . "/config"
1986 or return; 1995 or return;
1987 1996
1988 local $/; 1997 local $/;
1989 *CFG = YAML::Syck::Load <$fh>; 1998 *CFG = YAML::Syck::Load <$fh>;
1999
2000 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2001
2002 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2003 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2004
2005 if (exists $CFG{mlockall}) {
2006 eval {
2007 $CFG{mlockall} ? &mlockall : &munlockall
2008 and die "WARNING: m(un)lockall failed: $!\n";
2009 };
2010 warn $@ if $@;
2011 }
1990} 2012}
1991 2013
1992sub main { 2014sub main {
1993 # we must not ever block the main coroutine 2015 # we must not ever block the main coroutine
1994 local $Coro::idle = sub { 2016 local $Coro::idle = sub {
1995 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2017 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1996 (Coro::unblock_sub {
1997 Event::one_event; 2018 async { Event::one_event };
1998 })->();
1999 }; 2019 };
2000 2020
2001 cfg_load; 2021 cfg_load;
2002 db_load; 2022 db_load;
2003 load_extensions; 2023 load_extensions;
… …
2014 return; 2034 return;
2015 } 2035 }
2016 2036
2017 warn "reloading..."; 2037 warn "reloading...";
2018 2038
2019 local $FREEZE = 1; 2039 my $guard = freeze_mainloop;
2020 cf::emergency_save; 2040 cf::emergency_save;
2021 2041
2022 eval { 2042 eval {
2023 # if anything goes wrong in here, we should simply crash as we already saved 2043 # if anything goes wrong in here, we should simply crash as we already saved
2024 2044
… …
2160 reentrant => 0, 2180 reentrant => 0,
2161 prio => 0, 2181 prio => 0,
2162 at => $NEXT_TICK || $TICK, 2182 at => $NEXT_TICK || $TICK,
2163 data => WF_AUTOCANCEL, 2183 data => WF_AUTOCANCEL,
2164 cb => sub { 2184 cb => sub {
2165 unless ($FREEZE) {
2166 cf::server_tick; # one server iteration 2185 cf::server_tick; # one server iteration
2167 $RUNTIME += $TICK; 2186 $RUNTIME += $TICK;
2168 }
2169
2170 $NEXT_TICK += $TICK; 2187 $NEXT_TICK += $TICK;
2171 2188
2172 # if we are delayed by four ticks or more, skip them all 2189 # if we are delayed by four ticks or more, skip them all
2173 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2190 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2174 2191

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines