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.125 by root, Tue Jan 2 23:06:39 2007 UTC vs.
Revision 1.140 by root, Fri Jan 5 20:04:02 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
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}
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
234=item cf::async { BLOCK }
235
236Currently the same as Coro::async_pool, meaning you cannot use
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.
239
240=cut
241
242BEGIN { *async = \&Coro::async_pool }
249 243
250=item cf::sync_job { BLOCK } 244=item cf::sync_job { BLOCK }
251 245
252The design of crossfire+ requires that the main coro ($Coro::main) is 246The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 247always able to handle events or runnable, as crossfire+ is only partly
… …
267 # this is the main coro, too bad, we have to block 261 # this is the main coro, too bad, we have to block
268 # till the operation succeeds, freezing the server :/ 262 # till the operation succeeds, freezing the server :/
269 263
270 # TODO: use suspend/resume instead 264 # TODO: use suspend/resume instead
271 # (but this is cancel-safe) 265 # (but this is cancel-safe)
272 local $FREEZE = 1; 266 my $freeze_guard = freeze_mainloop;
273 267
274 my $busy = 1; 268 my $busy = 1;
275 my @res; 269 my @res;
276 270
277 (Coro::async { 271 (async {
278 @res = eval { $job->() }; 272 @res = eval { $job->() };
279 warn $@ if $@; 273 warn $@ if $@;
280 undef $busy; 274 undef $busy;
281 })->prio (Coro::PRIO_MAX); 275 })->prio (Coro::PRIO_MAX);
282 276
283 while ($busy) { 277 while ($busy) {
284 Coro::cede_notself; 278 unless (Coro::cede) {
285 Event::one_event unless Coro::nready; 279 Coro::nready ? Event::one_event 0 : Event::one_event;
280 Coro::cede_notself unless Coro::cede;
281 }
286 } 282 }
287 283
288 wantarray ? @res : $res[0] 284 wantarray ? @res : $res[0]
289 } else { 285 } else {
290 # we are in another coroutine, how wonderful, everything just works 286 # we are in another coroutine, how wonderful, everything just works
291 287
292 $job->() 288 $job->()
293 } 289 }
294} 290}
295 291
296=item $coro = cf::coro { BLOCK } 292=item $coro = cf::async_ext { BLOCK }
297 293
298Creates and returns a new coro. This coro is automcatially being canceled 294Like async, but this coro is automcatially being canceled when the
299when the extension calling this is being unloaded. 295extension calling this is being unloaded.
300 296
301=cut 297=cut
302 298
303sub coro(&) { 299sub async_ext(&) {
304 my $cb = shift; 300 my $cb = shift;
305 301
306 my $coro; $coro = async { 302 my $coro = &Coro::async ($cb);
307 eval {
308 $cb->();
309 };
310 warn $@ if $@;
311 };
312 303
313 $coro->on_destroy (sub { 304 $coro->on_destroy (sub {
314 delete $EXT_CORO{$coro+0}; 305 delete $EXT_CORO{$coro+0};
315 }); 306 });
316 $EXT_CORO{$coro+0} = $coro; 307 $EXT_CORO{$coro+0} = $coro;
… …
1126package cf::map; 1117package cf::map;
1127 1118
1128use Fcntl; 1119use Fcntl;
1129use Coro::AIO; 1120use Coro::AIO;
1130 1121
1131our $MAX_RESET = 7200; 1122our $MAX_RESET = 3600;
1132our $DEFAULT_RESET = 3600; 1123our $DEFAULT_RESET = 3000;
1133 1124
1134sub generate_random_map { 1125sub generate_random_map {
1135 my ($path, $rmp) = @_; 1126 my ($path, $rmp) = @_;
1136 1127
1137 # mit "rum" bekleckern, nicht 1128 # mit "rum" bekleckern, nicht
… …
1167 or return; 1158 or return;
1168 1159
1169 my $map = cf::map::new 1160 my $map = cf::map::new
1170 or return; 1161 or return;
1171 1162
1163 # for better error messages only, will be overwritten
1164 $map->path ($path);
1165
1172 $map->load_header ($path) 1166 $map->load_header ($path)
1173 or return; 1167 or return;
1174 1168
1175 $map->{load_path} = $path; 1169 $map->{load_path} = $path;
1176 1170
1177 $map 1171 $map
1178} 1172}
1179 1173
1174sub find;
1180sub find_map { 1175sub find {
1181 my ($path, $origin) = @_; 1176 my ($path, $origin) = @_;
1182 1177
1183 #warn "find_map<$path,$origin>\n";#d# 1178 #warn "find<$path,$origin>\n";#d#
1184 1179
1185 $path = new cf::path $path, $origin && $origin->path; 1180 $path = new cf::path $path, $origin && $origin->path;
1186 my $key = $path->as_string; 1181 my $key = $path->as_string;
1187 1182
1188 cf::lock_wait "map_find:$key"; 1183 cf::lock_wait "map_find:$key";
… …
1191 my $guard = cf::lock_acquire "map_find:$key"; 1186 my $guard = cf::lock_acquire "map_find:$key";
1192 1187
1193 # do it the slow way 1188 # do it the slow way
1194 my $map = try_load_header $path->save_path; 1189 my $map = try_load_header $path->save_path;
1195 1190
1191 Coro::cede;
1192
1196 if ($map) { 1193 if ($map) {
1194 $map->last_access ((delete $map->{last_access})
1195 || $cf::RUNTIME); #d#
1197 # safety 1196 # safety
1198 $map->{instantiate_time} = $cf::RUNTIME 1197 $map->{instantiate_time} = $cf::RUNTIME
1199 if $map->{instantiate_time} > $cf::RUNTIME; 1198 if $map->{instantiate_time} > $cf::RUNTIME;
1200 } else { 1199 } else {
1201 if (my $rmp = $path->random_map_params) { 1200 if (my $rmp = $path->random_map_params) {
… …
1206 1205
1207 $map or return; 1206 $map or return;
1208 1207
1209 $map->{load_original} = 1; 1208 $map->{load_original} = 1;
1210 $map->{instantiate_time} = $cf::RUNTIME; 1209 $map->{instantiate_time} = $cf::RUNTIME;
1210 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1211 $map->instantiate;
1212 1212
1213 # per-player maps become, after loading, normal maps 1213 # per-player maps become, after loading, normal maps
1214 $map->per_player (0) if $path->{user_rel}; 1214 $map->per_player (0) if $path->{user_rel};
1215 } 1215 }
1216 1216
1217 $map->path ($key); 1217 $map->path ($key);
1218 $map->{path} = $path; 1218 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME; 1219 $map->{last_save} = $cf::RUNTIME;
1220 $map->last_access ($cf::RUNTIME); 1220
1221 Coro::cede;
1221 1222
1222 if ($map->should_reset) { 1223 if ($map->should_reset) {
1223 $map->reset; 1224 $map->reset;
1224 undef $guard; 1225 undef $guard;
1225 $map = cf::map::find_map ($path) 1226 $map = find $path
1226 or return; 1227 or return;
1227 } 1228 }
1228 1229
1229 $cf::MAP{$key} = $map 1230 $cf::MAP{$key} = $map
1230 } 1231 }
… …
1252 if (aio_open $uniq, O_RDONLY, 0) { 1253 if (aio_open $uniq, O_RDONLY, 0) {
1253 $self->clear_unique_items; 1254 $self->clear_unique_items;
1254 $self->load_objects ($uniq, 0); 1255 $self->load_objects ($uniq, 0);
1255 } 1256 }
1256 } 1257 }
1258
1259 Coro::cede;
1257 1260
1258 # now do the right thing for maps 1261 # now do the right thing for maps
1259 $self->link_multipart_objects; 1262 $self->link_multipart_objects;
1260 1263
1261 if ($self->{path}->is_style_map) { 1264 if ($self->{path}->is_style_map) {
… …
1269 $self->difficulty ($self->estimate_difficulty) 1272 $self->difficulty ($self->estimate_difficulty)
1270 unless $self->difficulty; 1273 unless $self->difficulty;
1271 $self->activate; 1274 $self->activate;
1272 } 1275 }
1273 1276
1277 Coro::cede;
1278
1274 $self->in_memory (cf::MAP_IN_MEMORY); 1279 $self->in_memory (cf::MAP_IN_MEMORY);
1275} 1280}
1276 1281
1277sub load_map_sync { 1282sub find_sync {
1278 my ($path, $origin) = @_; 1283 my ($path, $origin) = @_;
1279 1284
1280 #warn "load_map_sync<$path, $origin>\n";#d# 1285 cf::sync_job { cf::map::find $path, $origin }
1286}
1281 1287
1282 cf::sync_job { 1288sub do_load_sync {
1283 my $map = cf::map::find_map $path, $origin 1289 my ($map) = @_;
1284 or return; 1290
1285 $map->load; 1291 cf::sync_job { $map->load };
1286 $map
1287 }
1288} 1292}
1289 1293
1290sub save { 1294sub save {
1291 my ($self) = @_; 1295 my ($self) = @_;
1292 1296
1297 my $lock = cf::lock_acquire "map_data:" . $self->path;
1298
1293 $self->{last_save} = $cf::RUNTIME; 1299 $self->{last_save} = $cf::RUNTIME;
1294 1300
1295 return unless $self->dirty; 1301 return unless $self->dirty;
1296 1302
1297 my $save = $self->{path}->save_path; utf8::encode $save; 1303 my $save = $self->{path}->save_path; utf8::encode $save;
1298 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1304 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1299 1305
1300 $self->{load_path} = $save; 1306 $self->{load_path} = $save;
1301 1307
1302 return if $self->{deny_save}; 1308 return if $self->{deny_save};
1309
1310 local $self->{last_access} = $self->last_access;#d#
1303 1311
1304 if ($uniq) { 1312 if ($uniq) {
1305 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1306 $self->save_objects ($uniq, cf::IO_UNIQUES); 1314 $self->save_objects ($uniq, cf::IO_UNIQUES);
1307 } else { 1315 } else {
… …
1310} 1318}
1311 1319
1312sub swap_out { 1320sub swap_out {
1313 my ($self) = @_; 1321 my ($self) = @_;
1314 1322
1323 # save first because save cedes
1324 $self->save;
1325
1326 my $lock = cf::lock_acquire "map_data:" . $self->path;
1327
1315 return if $self->players; 1328 return if $self->players;
1316 return if $self->in_memory != cf::MAP_IN_MEMORY; 1329 return if $self->in_memory != cf::MAP_IN_MEMORY;
1317 return if $self->{deny_save}; 1330 return if $self->{deny_save};
1318 1331
1319 $self->save;
1320 $self->clear; 1332 $self->clear;
1321 $self->in_memory (cf::MAP_SWAPPED); 1333 $self->in_memory (cf::MAP_SWAPPED);
1322} 1334}
1323 1335
1324sub reset_at { 1336sub reset_at {
… …
1362} 1374}
1363 1375
1364sub reset { 1376sub reset {
1365 my ($self) = @_; 1377 my ($self) = @_;
1366 1378
1379 my $lock = cf::lock_acquire "map_data:" . $self->path;
1380
1367 return if $self->players; 1381 return if $self->players;
1368 return if $self->{path}{user_rel};#d# 1382 return if $self->{path}{user_rel};#d#
1369 1383
1370 warn "resetting map ", $self->path;#d# 1384 warn "resetting map ", $self->path;#d#
1371 1385
… …
1390 1404
1391sub customise_for { 1405sub customise_for {
1392 my ($map, $ob) = @_; 1406 my ($map, $ob) = @_;
1393 1407
1394 if ($map->per_player) { 1408 if ($map->per_player) {
1395 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1409 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1396 } 1410 }
1397 1411
1398 $map 1412 $map
1399} 1413}
1400 1414
1401sub emergency_save { 1415sub emergency_save {
1402 local $cf::FREEZE = 1; 1416 my $freeze_guard = cf::freeze_mainloop;
1403 1417
1404 warn "enter emergency map save\n"; 1418 warn "enter emergency map save\n";
1405 1419
1406 cf::sync_job { 1420 cf::sync_job {
1407 warn "begin emergency map save\n"; 1421 warn "begin emergency map save\n";
… …
1497 my $link_pos = delete $self->{_link_pos}; 1511 my $link_pos = delete $self->{_link_pos};
1498 1512
1499 unless ($map) { 1513 unless ($map) {
1500 # restore original map position 1514 # restore original map position
1501 ($map, $x, $y) = @{ $link_pos || [] }; 1515 ($map, $x, $y) = @{ $link_pos || [] };
1502 $map = cf::map::find_map $map; 1516 $map = cf::map::find $map;
1503 1517
1504 unless ($map) { 1518 unless ($map) {
1505 ($map, $x, $y) = @$EMERGENCY_POSITION; 1519 ($map, $x, $y) = @$EMERGENCY_POSITION;
1506 $map = cf::map::find_map $map 1520 $map = cf::map::find $map
1507 or die "FATAL: cannot load emergency map\n"; 1521 or die "FATAL: cannot load emergency map\n";
1508 } 1522 }
1509 } 1523 }
1510 1524
1511 ($x, $y) = (-1, -1) 1525 ($x, $y) = (-1, -1)
… …
1536 my ($pl) = @_; 1550 my ($pl) = @_;
1537 1551
1538 # try to abort aborted map switching on player login :) 1552 # try to abort aborted map switching on player login :)
1539 # should happen only on crashes 1553 # should happen only on crashes
1540 if ($pl->ob->{_link_pos}) { 1554 if ($pl->ob->{_link_pos}) {
1555
1541 $pl->ob->enter_link; 1556 $pl->ob->enter_link;
1542 Coro::async { 1557 (async {
1543 # 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
1544 # 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);
1545 Coro::Timer::sleep 1; 1564 Coro::Timer::sleep 1;
1546 $pl->ob->leave_link; 1565 $pl->ob->leave_link;
1547 }; 1566 })->prio (2);
1548 } 1567 }
1549 }, 1568 },
1550); 1569);
1551 1570
1552=item $player_object->goto_map ($path, $x, $y) 1571=item $player_object->goto ($path, $x, $y)
1553 1572
1554=cut 1573=cut
1555 1574
1556sub cf::object::player::goto_map { 1575sub cf::object::player::goto {
1557 my ($self, $path, $x, $y) = @_; 1576 my ($self, $path, $x, $y) = @_;
1558 1577
1559 $self->enter_link; 1578 $self->enter_link;
1560 1579
1561 (Coro::async { 1580 (async {
1562 $path = new cf::path $path; 1581 $path = new cf::path $path;
1563 1582
1564 my $map = cf::map::find_map $path->as_string; 1583 my $map = cf::map::find $path->as_string;
1565 $map = $map->customise_for ($self) if $map; 1584 $map = $map->customise_for ($self) if $map;
1566 1585
1567# warn "entering ", $map->path, " at ($x, $y)\n" 1586# warn "entering ", $map->path, " at ($x, $y)\n"
1568# if $map; 1587# if $map;
1569 1588
… …
1628 1647
1629 return unless $self->type == cf::PLAYER; 1648 return unless $self->type == cf::PLAYER;
1630 1649
1631 $self->enter_link; 1650 $self->enter_link;
1632 1651
1633 (Coro::async { 1652 (async {
1653 $self->deactivate_recursive; # just to be sure
1634 unless (eval { 1654 unless (eval {
1635
1636 prepare_random_map $exit 1655 prepare_random_map $exit
1637 if $exit->slaying eq "/!"; 1656 if $exit->slaying eq "/!";
1638 1657
1639 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;
1640 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1659 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1641 1660
1642 1; 1661 1;
1643 }) { 1662 }) {
1644 $self->message ("Something went wrong deep within the crossfire server. " 1663 $self->message ("Something went wrong deep within the crossfire server. "
1645 . "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. "
… …
1702 on_reply => sub { 1721 on_reply => sub {
1703 my ($ns, $msg) = @_; 1722 my ($ns, $msg) = @_;
1704 1723
1705 # this weird shuffling is so that direct followup queries 1724 # this weird shuffling is so that direct followup queries
1706 # get handled first 1725 # get handled first
1707 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
1708 1728
1709 (shift @$queue)->[1]->($msg); 1729 (shift @$queue)->[1]->($msg);
1710 1730
1711 push @{ $ns->{query_queue} }, @$queue; 1731 push @{ $ns->{query_queue} }, @$queue;
1712 1732
… …
1718 } 1738 }
1719 } 1739 }
1720 }, 1740 },
1721); 1741);
1722 1742
1723=item $client->coro (\&cb) 1743=item $client->async (\&cb)
1724 1744
1725Create a new coroutine, running the specified callback. The coroutine will 1745Create a new coroutine, running the specified callback. The coroutine will
1726be automatically cancelled when the client gets destroyed (e.g. on logout, 1746be automatically cancelled when the client gets destroyed (e.g. on logout,
1727or loss of connection). 1747or loss of connection).
1728 1748
1729=cut 1749=cut
1730 1750
1731sub cf::client::coro { 1751sub cf::client::async {
1732 my ($self, $cb) = @_; 1752 my ($self, $cb) = @_;
1733 1753
1734 my $coro; $coro = async { 1754 my $coro = &Coro::async ($cb);
1735 eval {
1736 $cb->();
1737 };
1738 warn $@ if $@;
1739 };
1740 1755
1741 $coro->on_destroy (sub { 1756 $coro->on_destroy (sub {
1742 delete $self->{_coro}{$coro+0}; 1757 delete $self->{_coro}{$coro+0};
1743 }); 1758 });
1744 1759
… …
1979 open my $fh, "<:utf8", cf::confdir . "/config" 1994 open my $fh, "<:utf8", cf::confdir . "/config"
1980 or return; 1995 or return;
1981 1996
1982 local $/; 1997 local $/;
1983 *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 }
1984} 2012}
1985 2013
1986sub main { 2014sub main {
1987 # we must not ever block the main coroutine 2015 # we must not ever block the main coroutine
1988 local $Coro::idle = sub { 2016 local $Coro::idle = sub {
1989 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#
1990 (Coro::unblock_sub {
1991 Event::one_event; 2018 async { Event::one_event };
1992 })->();
1993 }; 2019 };
1994 2020
1995 cfg_load; 2021 cfg_load;
1996 db_load; 2022 db_load;
1997 load_extensions; 2023 load_extensions;
… …
2008 return; 2034 return;
2009 } 2035 }
2010 2036
2011 warn "reloading..."; 2037 warn "reloading...";
2012 2038
2013 local $FREEZE = 1; 2039 my $guard = freeze_mainloop;
2014 cf::emergency_save; 2040 cf::emergency_save;
2015 2041
2016 eval { 2042 eval {
2017 # 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
2018 2044
… …
2154 reentrant => 0, 2180 reentrant => 0,
2155 prio => 0, 2181 prio => 0,
2156 at => $NEXT_TICK || $TICK, 2182 at => $NEXT_TICK || $TICK,
2157 data => WF_AUTOCANCEL, 2183 data => WF_AUTOCANCEL,
2158 cb => sub { 2184 cb => sub {
2159 unless ($FREEZE) {
2160 cf::server_tick; # one server iteration 2185 cf::server_tick; # one server iteration
2161 $RUNTIME += $TICK; 2186 $RUNTIME += $TICK;
2162 }
2163
2164 $NEXT_TICK += $TICK; 2187 $NEXT_TICK += $TICK;
2165 2188
2166 # 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
2167 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2190 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2168 2191

Diff Legend

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