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.494 by root, Mon Oct 26 05:18:00 2009 UTC vs.
Revision 1.532 by root, Thu Apr 29 07:32:34 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
53use Coro::Util (); 53use Coro::Util ();
54 54
55use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
56use BDB (); 56use BDB ();
57use Data::Dumper; 57use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 58use Fcntl;
60use YAML::XS (); 59use YAML::XS ();
61use IO::AIO (); 60use IO::AIO ();
62use Time::HiRes; 61use Time::HiRes;
63use Compress::LZF; 62use Compress::LZF;
… …
107our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
108our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 110
112our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
113 118
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 121our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
163 168
164our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
165 170
166sub cf::map::normalise; 171sub cf::map::normalise;
167 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
168############################################################################# 177#############################################################################
169 178
170%REFLECT = (); 179%REFLECT = ();
171for (@REFLECT) { 180for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
243 252
244=back 253=back
245 254
246=cut 255=cut
247 256
257sub error(@) { LOG llevError, join "", @_ }
258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
248$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
249 my $msg = join "", @_; 264 my $msg = join "", @_;
250 265
251 $msg .= "\n" 266 $msg .= "\n"
252 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
253 268
254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
255 270
256 LOG llevError, $msg; 271 LOG llevWarn, $msg;
257}; 272};
258 273
259$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
261 276
262 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
263 278
264 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 281 return;#d#
267 }#d# 282 }#d#
268 283
269 # kill coroutine otherwise 284 # kill coroutine otherwise
270 Coro::terminate 285 Coro::terminate
… …
397} 412}
398 413
399=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
400 415
401Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer. 417get spread over time.
403 418
404=cut 419=cut
405 420
406sub periodic($$) { 421sub periodic($$) {
407 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
… …
424 439
425=cut 440=cut
426 441
427our @SLOT_QUEUE; 442our @SLOT_QUEUE;
428our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
429 445
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
433 449
434 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
435 452
436 while () { 453 while () {
437 next_job: 454 next_job:
455
438 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 457
440 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 462 $job->[2]->send;
444 Coro::cede; 463 Coro::cede;
445 goto next_job; 464 goto next_job;
446 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 467 }
448 } 468 }
449 469
450 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 473 $signal->wait;
454 } else { 474 } else {
475 $busy = 0;
455 Coro::schedule; 476 Coro::schedule;
456 } 477 }
457 } 478 }
458}; 479};
459 480
460sub get_slot($;$$) { 481sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
462 483
463 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
464 485
465 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
466 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
467 489
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
… …
497 519
498sub sync_job(&) { 520sub sync_job(&) {
499 my ($job) = @_; 521 my ($job) = @_;
500 522
501 if ($Coro::current == $Coro::main) { 523 if ($Coro::current == $Coro::main) {
502 my $time = EV::time; 524 my $time = AE::time;
503 525
504 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
506 528
507 LOG llevError, Carp::longmess "sync job";#d# 529 LOG llevError, Carp::longmess "sync job";#d#
… …
512 my @res; 534 my @res;
513 535
514 (async { 536 (async {
515 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
516 @res = eval { $job->() }; 538 @res = eval { $job->() };
517 warn $@ if $@; 539 error $@ if $@;
518 undef $busy; 540 undef $busy;
519 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
520 542
521 while ($busy) { 543 while ($busy) {
522 if (Coro::nready) { 544 if (Coro::nready) {
… …
524 } else { 546 } else {
525 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
526 } 548 }
527 } 549 }
528 550
529 my $time = EV::time - $time; 551 my $time = AE::time - $time;
530 552
531 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
532 554
533 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
534 } else { 556 } else {
… …
578 reset_signals; 600 reset_signals;
579 &$cb 601 &$cb
580 }, @args; 602 }, @args;
581 603
582 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
583} 616}
584 617
585=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
586 619
587=cut 620=cut
… …
722 755
723 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
724 my $data = $process->(\@data); 757 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
726 759
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 761
729 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
732 765
… …
742 775
743=cut 776=cut
744 777
745sub datalog($@) { 778sub datalog($@) {
746 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 781}
749 782
750=back 783=back
751 784
752=cut 785=cut
… …
947 980
948 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 983
951 } elsif (ref $type) { 984 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
953 986
954 } else { 987 } else {
955 shift @arg; 988 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
957 } 990 }
958 } 991 }
959} 992}
960 993
961sub _object_attach { 994sub _object_attach {
… …
971 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
972 } 1005 }
973 1006
974 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
975 } else { 1008 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1010 }
978 1011
979 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
980} 1013}
981 1014
… …
1040 1073
1041 for (@$callbacks) { 1074 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1043 1076
1044 if ($@) { 1077 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1079 override;
1048 } 1080 }
1049 1081
1050 return 1 if $override; 1082 return 1 if $override;
1051 } 1083 }
… …
1130 for (@$attach) { 1162 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1133 } 1165 }
1134 } else { 1166 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1168 }
1137 } 1169 }
1138} 1170}
1139 1171
1140cf::attachable->attach ( 1172cf::attachable->attach (
… …
1167 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1168 1200
1169 sync_job { 1201 sync_job {
1170 if (length $$rdata) { 1202 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1174 1207
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1211 if ($cf::USE_FSYNC) {
… …
1200 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1201 1234
1202 $filename =~ s%/[^/]+$%%; 1235 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC; 1236 aio_pathsync $filename if $cf::USE_FSYNC;
1204 } else { 1237 } else {
1205 warn "unable to save objects: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1206 } 1239 }
1207 } else { 1240 } else {
1208 aio_unlink $filename; 1241 aio_unlink $filename;
1209 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1210 } 1243 }
… …
1234 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs}; 1268 $av = $st->{objs};
1236 } 1269 }
1237 1270
1238 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1241 1275
1242 ($data, $av) 1276 ($data, $av)
1243} 1277}
1244 1278
1245=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
… …
1304} 1338}
1305 1339
1306use File::Glob (); 1340use File::Glob ();
1307 1341
1308cf::player->attach ( 1342cf::player->attach (
1309 on_command => sub { 1343 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1311 1345
1312 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1313 or return; 1347 or return;
1314 1348
… …
1337 1371
1338 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1339 if $reply; 1373 if $reply;
1340 1374
1341 } else { 1375 } else {
1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343 } 1377 }
1344 1378
1345 cf::override; 1379 cf::override;
1346 }, 1380 },
1347); 1381);
… …
1358 1392
1359 $grp 1393 $grp
1360} 1394}
1361 1395
1362sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1363 cf::sync_job { 1399 cf::sync_job {
1364 my %todo; 1400 my %todo;
1365 1401
1366 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1367 next unless -r $path; 1403 next unless -r $path;
… …
1393 . "\n};\n1"; 1429 . "\n};\n1";
1394 1430
1395 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1396 } 1432 }
1397 1433
1434 my $pass = 0;
1398 my %done; 1435 my %done;
1399 while (%todo) { 1436 while (%todo) {
1400 my $progress; 1437 my $progress;
1401 1438
1439 ++$pass;
1440
1441 ext:
1402 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1444 next ext
1405 unless exists $done{$_}; 1445 unless exists $done{$_};
1406 } 1446 }
1407 1447
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1449
1410 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1454
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1456 if exists $v->{meta}{mandatory};
1418 1457
1419 warn $msg; 1458 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1459 delete $todo{$k};
1460 } else {
1461 $done{$k} = delete $todo{$k};
1462 push @EXTS, $v->{pkg};
1463 $progress = 1;
1464
1465 info "$v->{base}: extension inactive.\n"
1466 unless $active;
1420 } 1467 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1468 }
1426 1469
1427 skip: 1470 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1471 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1472
1473 while (my ($k, $v) = each %todo) {
1474 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475 if exists $v->{meta}{mandatory};
1476 }
1477 }
1430 } 1478 }
1431 }; 1479 };
1432} 1480}
1433 1481
1434############################################################################# 1482#############################################################################
… …
1518 $cf::PLAYER{$login} = $pl 1566 $cf::PLAYER{$login} = $pl
1519 } 1567 }
1520 } 1568 }
1521} 1569}
1522 1570
1571cf::player->attach (
1572 on_load => sub {
1573 my ($pl, $path) = @_;
1574
1575 # restore slots saved in save, below
1576 my $slots = delete $pl->{_slots};
1577
1578 $pl->ob->current_weapon ($slots->[0]);
1579 $pl->combat_ob ($slots->[1]);
1580 $pl->ranged_ob ($slots->[2]);
1581 },
1582);
1583
1523sub save($) { 1584sub save($) {
1524 my ($pl) = @_; 1585 my ($pl) = @_;
1525 1586
1526 return if $pl->{deny_save}; 1587 return if $pl->{deny_save};
1527 1588
… …
1532 1593
1533 aio_mkdir playerdir $pl, 0770; 1594 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1595 $pl->{last_save} = $cf::RUNTIME;
1535 1596
1536 cf::get_slot 0.01; 1597 cf::get_slot 0.01;
1598
1599 # save slots, to be restored later
1600 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1601
1538 $pl->save_pl ($path); 1602 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1603 cf::cede_to_tick;
1540} 1604}
1541 1605
… …
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1643
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1581 $pl->deactivate; 1645 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1585 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1586 1649
1587 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1643 \@logins 1706 \@logins
1644} 1707}
1645 1708
1646=item $player->maps 1709=item $player->maps
1647 1710
1711=item cf::player::maps $login
1712
1648Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1649player. May block. 1714player. May block.
1650 1715
1651=cut 1716=cut
1652 1717
… …
1714=cut 1779=cut
1715 1780
1716sub find_by_path($) { 1781sub find_by_path($) {
1717 my ($path) = @_; 1782 my ($path) = @_;
1718 1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1785
1719 my ($match, $specificity); 1786 my ($match, $specificity);
1720 1787
1721 for my $region (list) { 1788 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
1723 ($match, $specificity) = ($region, $region->specificity) 1790 ($match, $specificity) = ($region, $region->specificity)
… …
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1821 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 1822
1756 # mit "rum" bekleckern, nicht 1823 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1824 $self->_create_random_map (
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map}, 1828 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize}, 1829 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1786 1853
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 1855}
1789 1856
1790# also paths starting with '/' 1857# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 1859
1793sub thawer_merge { 1860sub thawer_merge {
1794 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1795 1862
1796 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
… …
2010 2077
2011 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
2012 } 2079 }
2013} 2080}
2014 2081
2015sub pre_load { } 2082sub pre_load { }
2016sub post_load { } 2083#sub post_load { } # XS
2017 2084
2018sub load { 2085sub load {
2019 my ($self) = @_; 2086 my ($self) = @_;
2020 2087
2021 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
… …
2078 } 2145 }
2079 2146
2080 $self->post_load; 2147 $self->post_load;
2081} 2148}
2082 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2083sub customise_for { 2153sub customise_for {
2084 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2085 2155
2086 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2157 if $self->per_player;
… …
2103 or next; 2173 or next;
2104 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2105 or next; 2175 or next;
2106 $neigh->load; 2176 $neigh->load;
2107 2177
2178 # now find the diagonal neighbours
2108 push @neigh, 2179 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2182 }
2112 2183
… …
2164 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2165 2236
2166 () 2237 ()
2167} 2238}
2168 2239
2240# common code, used by both ->save and ->swapout
2169sub save { 2241sub _save {
2170 my ($self) = @_; 2242 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2243
2174 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2175 2245
2176 return unless $self->dirty; 2246 return unless $self->dirty;
2177 2247
… …
2197 } else { 2267 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2269 }
2200} 2270}
2201 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2202sub swap_out { 2280sub swap_out {
2203 my ($self) = @_; 2281 my ($self) = @_;
2204 2282
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2284
2210 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2285 return if $self->in_memory != cf::MAP_ACTIVE;
2212 return if $self->{deny_save}; 2286 return if $self->{deny_save};
2287 return if $self->players;
2213 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2214 $self->in_memory (cf::MAP_SWAPPED); 2292 $self->in_memory (cf::MAP_SWAPPED);
2293
2294 # then atomically save
2295 $self->_save;
2296
2297 # then free the map
2298 $self->clear;
2299}
2300
2301sub reset_at {
2302 my ($self) = @_;
2303
2304 # TODO: safety, remove and allow resettable per-player maps
2305 return 1e99 if $self->{deny_reset};
2306
2307 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2308 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2309
2310 $time + $to
2311}
2312
2313sub should_reset {
2314 my ($self) = @_;
2315
2316 $self->reset_at <= $cf::RUNTIME
2317}
2318
2319sub reset {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 return if $self->players;
2325
2326 cf::trace "resetting map ", $self->path, "\n";
2327
2328 $self->in_memory (cf::MAP_SWAPPED);
2329
2330 # need to save uniques path
2331 unless ($self->{deny_save}) {
2332 my $uniq = $self->uniq_path; utf8::encode $uniq;
2333
2334 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2335 if $uniq;
2336 }
2337
2338 delete $cf::MAP{$self->path};
2215 2339
2216 $self->deactivate; 2340 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2342 $self->clear;
2219}
2220
2221sub reset_at {
2222 my ($self) = @_;
2223
2224 # TODO: safety, remove and allow resettable per-player maps
2225 return 1e99 if $self->{deny_reset};
2226
2227 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2228 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2229
2230 $time + $to
2231}
2232
2233sub should_reset {
2234 my ($self) = @_;
2235
2236 $self->reset_at <= $cf::RUNTIME
2237}
2238
2239sub reset {
2240 my ($self) = @_;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2244 return if $self->players;
2245
2246 warn "resetting map ", $self->path, "\n";
2247
2248 $self->in_memory (cf::MAP_SWAPPED);
2249
2250 # need to save uniques path
2251 unless ($self->{deny_save}) {
2252 my $uniq = $self->uniq_path; utf8::encode $uniq;
2253
2254 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2255 if $uniq;
2256 }
2257
2258 delete $cf::MAP{$self->path};
2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->clear;
2263 2343
2264 $self->unlink_save; 2344 $self->unlink_save;
2265 $self->destroy; 2345 $self->destroy;
2266} 2346}
2267 2347
… …
2275 2355
2276 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2277 2357
2278 $self->unlink_save; 2358 $self->unlink_save;
2279 2359
2280 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2365
… …
2515 2595
2516Freezes the player and moves him/her to a special map (C<{link}>). 2596Freezes the player and moves him/her to a special map (C<{link}>).
2517 2597
2518The player should be reasonably safe there for short amounts of time (e.g. 2598The player should be reasonably safe there for short amounts of time (e.g.
2519for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2599for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link 2600though, as the player cannot control the character while it is on the link
2521map. 2601map.
2522 2602
2523Will never block. 2603Will never block.
2524 2604
2525=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
… …
2546sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2547 my ($self) = @_; 2627 my ($self) = @_;
2548 2628
2549 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2550 2630
2631 ++$self->{_link_recursion};
2632
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2634
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2555 2637
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2639}
2558 2640
2559sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2561 2643
… …
2586 $map->load_neighbours; 2668 $map->load_neighbours;
2587 2669
2588 return unless $self->contr->active; 2670 return unless $self->contr->active;
2589 2671
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2592 2674 # entering was successful
2675 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2676 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2677 $self->activate_recursive;
2595} 2678 }
2596 2679
2680}
2681
2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2682=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598 2683
2599Moves the player to the given map-path and coordinates by first freezing 2684Moves the player to the given map-path and coordinates by first freezing
2600her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2601that has to return the map if sucecssful, and then unfreezes the player on 2686that has to return the map if sucecssful, and then unfreezes the player on
2602the new (success) or old (failed) map position. In either case, $done will 2687the new (success) or old (failed) map position. In either case, $done will
… …
2609 2694
2610our $GOTOGEN; 2695our $GOTOGEN;
2611 2696
2612sub cf::object::player::goto { 2697sub cf::object::player::goto {
2613 my ($self, $path, $x, $y, $check, $done) = @_; 2698 my ($self, $path, $x, $y, $check, $done) = @_;
2699
2700 if ($self->{_link_recursion} >= $MAX_LINKS) {
2701 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2702 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2703 ($path, $x, $y) = @$EMERGENCY_POSITION;
2704 }
2614 2705
2615 # do generation counting so two concurrent goto's will be executed in-order 2706 # do generation counting so two concurrent goto's will be executed in-order
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2708
2618 $self->enter_link; 2709 $self->enter_link;
… …
2642 my $map = eval { 2733 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2644 2735
2645 if ($map) { 2736 if ($map) {
2646 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2739 } else {
2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2740 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 } 2741 }
2651 2742
2652 $map 2743 $map
… …
2660 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2663 } 2754 }
2664 2755
2665 $done->() if $done; 2756 $done->($self) if $done;
2666 })->prio (1); 2757 })->prio (1);
2667} 2758}
2668 2759
2669=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2670 2761
… …
2763 $self->message ("Something went wrong deep within the deliantra server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "I'll try to bring you back to the map you were before. " 2855 . "I'll try to bring you back to the map you were before. "
2765 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2767 2858
2768 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 2860 $self->leave_link;
2770 } 2861 }
2771 })->prio (1); 2862 })->prio (1);
2772} 2863}
2773 2864
… …
3086 3177
3087 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
3088 if $reply; 3179 if $reply;
3089 3180
3090 } else { 3181 } else {
3091 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3092 } 3183 }
3093 3184
3094 cf::override; 3185 cf::override;
3095 }, 3186 },
3096); 3187);
… …
3116 3207
3117 $coro 3208 $coro
3118} 3209}
3119 3210
3120cf::client->attach ( 3211cf::client->attach (
3121 on_destroy => sub { 3212 on_client_destroy => sub {
3122 my ($ns) = @_; 3213 my ($ns) = @_;
3123 3214
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3215 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3216 },
3126); 3217);
… …
3142our $safe_hole = new Safe::Hole; 3233our $safe_hole = new Safe::Hole;
3143 3234
3144$SIG{FPE} = 'IGNORE'; 3235$SIG{FPE} = 'IGNORE';
3145 3236
3146$safe->permit_only (Opcode::opset qw( 3237$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3238 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3239 grepstart grepwhile mapstart mapwhile
3149 sort time 3240 sort time
3150)); 3241));
3151 3242
3152# here we export the classes and methods available to script code 3243# here we export the classes and methods available to script code
… …
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3295 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3296 $qcode =~ s/\n/\\n/g;
3206 3297
3207 %vars = (_dummy => 0) unless %vars; 3298 %vars = (_dummy => 0) unless %vars;
3208 3299
3300 my @res;
3209 local $_; 3301 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3302
3212 my $eval = 3303 my $eval =
3213 "do {\n" 3304 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3305 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3306 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3307 . $code
3217 . "\n}" 3308 . "\n}"
3218 ; 3309 ;
3219 3310
3311 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3312 sub_generation_inc;
3313 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3314 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3315 sub_generation_inc;
3316 } else {
3317 local @cf::_safe_eval_args = values %vars;
3318 @res = wantarray ? eval eval : scalar eval $eval;
3319 }
3223 3320
3224 if ($@) { 3321 if ($@) {
3225 warn "$@"; 3322 warn "$@",
3226 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3228 } 3325 }
3229 3326
3230 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3231} 3328}
3232 3329
… …
3246=cut 3343=cut
3247 3344
3248sub register_script_function { 3345sub register_script_function {
3249 my ($fun, $cb) = @_; 3346 my ($fun, $cb) = @_;
3250 3347
3251 no strict 'refs'; 3348 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3349 *$fun = $safe_hole->wrap ($cb);
3253} 3350}
3254 3351
3255=back 3352=back
3256 3353
3257=cut 3354=cut
… …
3266 # for this (global event?) 3363 # for this (global event?)
3267 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3268 3365
3269 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3270 3367
3271 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3272 3369
3273 my $facedata; 3370 my $facedata;
3274 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3275 or die "$path: $!"; 3372 or die "$path: $!";
3276 3373
… …
3278 3375
3279 $facedata->{version} == 2 3376 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3377 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3378
3282 # patch in the exptable 3379 # patch in the exptable
3380 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3283 $facedata->{resource}{"res/exp_table"} = { 3381 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3382 type => FT_RSRC,
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3383 data => $exp_table,
3384 hash => (Digest::MD5::md5 $exp_table),
3286 }; 3385 };
3287 cf::cede_to_tick; 3386 cf::cede_to_tick;
3288 3387
3289 { 3388 {
3290 my $faces = $facedata->{faceinfo}; 3389 my $faces = $facedata->{faceinfo};
… …
3292 while (my ($face, $info) = each %$faces) { 3391 while (my ($face, $info) = each %$faces) {
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3392 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3393
3295 cf::face::set_visibility $idx, $info->{visibility}; 3394 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3395 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3299 3398
3300 cf::cede_to_tick; 3399 cf::cede_to_tick;
3301 } 3400 }
3302 3401
3303 while (my ($face, $info) = each %$faces) { 3402 while (my ($face, $info) = each %$faces) {
… …
3308 3407
3309 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3310 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3311 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3312 } else { 3411 } else {
3313 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3314 } 3413 }
3315 3414
3316 cf::cede_to_tick; 3415 cf::cede_to_tick;
3317 } 3416 }
3318 } 3417 }
… …
3327 3426
3328 cf::anim::invalidate_all; # d'oh 3427 cf::anim::invalidate_all; # d'oh
3329 } 3428 }
3330 3429
3331 { 3430 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3431 my $res = $facedata->{resource};
3335 3432
3336 while (my ($name, $info) = each %$res) { 3433 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3434 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3436
3341 if ($info->{type} & 1) { 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3342 # prepend meta info
3343
3344 my $meta = $enc->encode ({
3345 name => $name,
3346 %{ $info->{meta} || {} },
3347 });
3348
3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type}; 3438 cf::face::set_type $idx, $info->{type};
3356 } else { 3439 } else {
3357 $RESOURCE{$name} = $info; 3440 $RESOURCE{$name} = $info; # unused
3358 } 3441 }
3359 3442
3360 cf::cede_to_tick; 3443 cf::cede_to_tick;
3361 } 3444 }
3362 } 3445 }
3363 3446
3364 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3365 3448
3366 1 3449 1
3367} 3450}
3368
3369cf::global->attach (on_resource_update => sub {
3370 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3371 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3372
3373 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3374 my $sound = $soundconf->{compat}[$_]
3375 or next;
3376
3377 my $face = cf::face::find "sound/$sound->[1]";
3378 cf::sound::set $sound->[0] => $face;
3379 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3380 }
3381
3382 while (my ($k, $v) = each %{$soundconf->{event}}) {
3383 my $face = cf::face::find "sound/$v";
3384 cf::sound::set $k => $face;
3385 }
3386 }
3387});
3388 3451
3389register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3390 my ($ns, $want) = @_; 3453 my ($ns, $want) = @_;
3391 3454
3392 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
… …
3431sub reload_treasures { 3494sub reload_treasures {
3432 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3433 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3434} 3497}
3435 3498
3499sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n";
3501
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3506
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_]
3509 or next;
3510
3511 my $face = cf::face::find "sound/$sound->[1]";
3512 cf::sound::set $sound->[0] => $face;
3513 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3514 }
3515
3516 while (my ($k, $v) = each %{$soundconf->{event}}) {
3517 my $face = cf::face::find "sound/$v";
3518 cf::sound::set $k => $face;
3519 }
3520}
3521
3436sub reload_resources { 3522sub reload_resources {
3437 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3438 3524
3439 reload_facedata; 3525 reload_facedata;
3526 reload_sound;
3440 reload_archetypes; 3527 reload_archetypes;
3441 reload_regions; 3528 reload_regions;
3442 reload_treasures; 3529 reload_treasures;
3443 3530
3444 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3445} 3532}
3446 3533
3447sub reload_config { 3534sub reload_config {
3448 warn "reloading config file...\n"; 3535 trace "reloading config file...\n";
3449 3536
3450 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3451 or return; 3538 or return;
3452 3539
3453 local $/; 3540 local $/;
3454 *CFG = YAML::XS::Load scalar <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3455 3542
3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3457 3544
3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3460 3547
3461 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
… …
3464 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3465 }; 3552 };
3466 warn $@ if $@; 3553 warn $@ if $@;
3467 } 3554 }
3468 3555
3469 warn "finished reloading resource files\n"; 3556 trace "finished reloading resource files\n";
3470} 3557}
3471 3558
3472sub pidfile() { 3559sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!"; 3561 or die "$PIDFILE: $!";
… …
3487 seek $fh, 0, 0; 3574 seek $fh, 0, 0;
3488 print $fh $$; 3575 print $fh $$;
3489} 3576}
3490 3577
3491sub main_loop { 3578sub main_loop {
3492 warn "EV::loop starting\n"; 3579 trace "EV::loop starting\n";
3493 if (1) { 3580 if (1) {
3494 EV::loop; 3581 EV::loop;
3495 } 3582 }
3496 warn "EV::loop returned\n"; 3583 trace "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP; 3584 goto &main_loop unless $REALLY_UNLOOP;
3498} 3585}
3499 3586
3500sub main { 3587sub main {
3501 cf::init_globals; # initialise logging 3588 cf::init_globals; # initialise logging
3502 3589
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512 3594
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514 3596
3515 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
… …
3522 }; 3604 };
3523 3605
3524 evthread_start IO::AIO::poll_fileno; 3606 evthread_start IO::AIO::poll_fileno;
3525 3607
3526 cf::sync_job { 3608 cf::sync_job {
3609 cf::init_experience;
3610 cf::init_anim;
3611 cf::init_attackmess;
3612 cf::init_dynamic;
3613
3614 cf::load_settings;
3615 cf::load_materials;
3616
3527 reload_resources; 3617 reload_resources;
3528 reload_config; 3618 reload_config;
3529 db_init; 3619 db_init;
3530 3620
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid; 3621 cf::init_uuid;
3534 cf::init_signals; 3622 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills; 3623 cf::init_skills;
3537 3624
3538 cf::init_beforeplay; 3625 cf::init_beforeplay;
3539 3626
3540 atomic; 3627 atomic;
… …
3547 use POSIX (); 3634 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549 3636
3550 (pop @POST_INIT)->(0) while @POST_INIT; 3637 (pop @POST_INIT)->(0) while @POST_INIT;
3551 }; 3638 };
3639
3640 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n";
3552 3642
3553 main_loop; 3643 main_loop;
3554} 3644}
3555 3645
3556############################################################################# 3646#############################################################################
… …
3558 3648
3559# install some emergency cleanup handlers 3649# install some emergency cleanup handlers
3560BEGIN { 3650BEGIN {
3561 our %SIGWATCHER = (); 3651 our %SIGWATCHER = ();
3562 for my $signal (qw(INT HUP TERM)) { 3652 for my $signal (qw(INT HUP TERM)) {
3563 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3653 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3564 cf::cleanup "SIG$signal"; 3654 cf::cleanup "SIG$signal";
3565 }; 3655 };
3566 } 3656 }
3567} 3657}
3568 3658
3569sub write_runtime_sync { 3659sub write_runtime_sync {
3660 my $t0 = AE::time;
3661
3570 # first touch the runtime file to show we are still running: 3662 # first touch the runtime file to show we are still running:
3571 # the fsync below can take a very very long time. 3663 # the fsync below can take a very very long time.
3572 3664
3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3665 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3574 3666
3575 my $guard = cf::lock_acquire "write_runtime"; 3667 my $guard = cf::lock_acquire "write_runtime";
3576 3668
3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3669 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3578 or return; 3670 or return;
3579 3671
3580 my $value = $cf::RUNTIME + 90 + 10; 3672 my $value = $cf::RUNTIME + 90 + 10;
3581 # 10 is the runtime save interval, for a monotonic clock 3673 # 10 is the runtime save interval, for a monotonic clock
3582 # 60 allows for the watchdog to kill the server. 3674 # 60 allows for the watchdog to kill the server.
… …
3595 or return; 3687 or return;
3596 3688
3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3598 and return; 3690 and return;
3599 3691
3600 warn "runtime file written.\n"; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3601 3693
3602 1 3694 1
3603} 3695}
3604 3696
3605our $uuid_lock; 3697our $uuid_lock;
… …
3617 or return; 3709 or return;
3618 3710
3619 my $value = uuid_seq uuid_cur; 3711 my $value = uuid_seq uuid_cur;
3620 3712
3621 unless ($value) { 3713 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n"; 3714 info "cowardly refusing to write zero uuid value!\n";
3623 return; 3715 return;
3624 } 3716 }
3625 3717
3626 my $value = uuid_str $value + $uuid_skip; 3718 my $value = uuid_str $value + $uuid_skip;
3627 $uuid_skip = 0; 3719 $uuid_skip = 0;
… …
3637 or return; 3729 or return;
3638 3730
3639 aio_rename "$uuid~", $uuid 3731 aio_rename "$uuid~", $uuid
3640 and return; 3732 and return;
3641 3733
3642 warn "uuid file written ($value).\n"; 3734 trace "uuid file written ($value).\n";
3643 3735
3644 1 3736 1
3645 3737
3646} 3738}
3647 3739
… …
3653} 3745}
3654 3746
3655sub emergency_save() { 3747sub emergency_save() {
3656 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3657 3749
3658 warn "emergency_perl_save: enter\n"; 3750 info "emergency_perl_save: enter\n";
3659 3751
3660 cf::sync_job { 3752 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so 3753 # this is a trade-off: we want to be very quick here, so
3662 # save all maps without fsync, and later call a global sync 3754 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow) 3755 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0; 3756 local $USE_FSYNC = 0;
3665 3757
3666 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3667 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3668 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3669 warn "emergency_perl_save: begin player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3670 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3671 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3672 $pl->valid or next; 3764 $pl->valid or next;
3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3674 $pl->save; 3766 $pl->save;
3675 } 3767 }
3676 warn "emergency_perl_save: end player save\n"; 3768 info "emergency_perl_save: end player save\n";
3677 3769
3678 warn "emergency_perl_save: begin map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3679 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3680 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3681 $map->valid or next; 3773 $map->valid or next;
3682 $map->save; 3774 $map->save;
3683 } 3775 }
3684 warn "emergency_perl_save: end map save\n"; 3776 info "emergency_perl_save: end map save\n";
3685 3777
3686 warn "emergency_perl_save: begin database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3687 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3688 warn "emergency_perl_save: end database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3689 3781
3690 warn "emergency_perl_save: begin write uuid\n"; 3782 info "emergency_perl_save: begin write uuid\n";
3691 write_uuid_sync 1; 3783 write_uuid_sync 1;
3692 warn "emergency_perl_save: end write uuid\n"; 3784 info "emergency_perl_save: end write uuid\n";
3693 }; 3785 };
3694 3786
3695 warn "emergency_perl_save: starting sync()\n"; 3787 info "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub { 3788 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n"; 3789 info "emergency_perl_save: finished sync()\n";
3698 }; 3790 };
3699 3791
3700 warn "emergency_perl_save: leave\n"; 3792 info "emergency_perl_save: leave\n";
3701} 3793}
3702 3794
3703sub post_cleanup { 3795sub post_cleanup {
3704 my ($make_core) = @_; 3796 my ($make_core) = @_;
3705 3797
3706 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3707 if $make_core; 3799 if $make_core;
3708 3800
3709 my $fh = pidfile; 3801 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$; 3802 unlink $PIDFILE if <$fh> == $$;
3711} 3803}
… …
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) { 3824 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"}; 3825 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 } 3827 }
3736 warn "cleared package $pkg\n";#d#
3737} 3828}
3738 3829
3739sub do_reload_perl() { 3830sub do_reload_perl() {
3740 # can/must only be called in main 3831 # can/must only be called in main
3741 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3742 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3743 return; 3834 return;
3744 } 3835 }
3745 3836
3746 return if $RELOAD++; 3837 return if $RELOAD++;
3747 3838
3748 my $t1 = EV::time; 3839 my $t1 = AE::time;
3749 3840
3750 while ($RELOAD) { 3841 while ($RELOAD) {
3751 warn "reloading..."; 3842 info "reloading...";
3752 3843
3753 warn "entering sync_job"; 3844 trace "entering sync_job";
3754 3845
3755 cf::sync_job { 3846 cf::sync_job {
3756 cf::write_runtime_sync; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3757 cf::emergency_save; 3848 cf::emergency_save;
3758 cf::write_runtime_sync; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3759 3850
3760 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3761 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3762 3853
3763 # if anything goes wrong in here, we should simply crash as we already saved 3854 # if anything goes wrong in here, we should simply crash as we already saved
3764 3855
3765 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3766 while (IO::AIO::nreqs || BDB::nreqs) { 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3768 } 3859 }
3769 3860
3770 warn "cancelling all extension coros"; 3861 trace "cancelling all extension coros";
3771 $_->cancel for values %EXT_CORO; 3862 $_->cancel for values %EXT_CORO;
3772 %EXT_CORO = (); 3863 %EXT_CORO = ();
3773 3864
3774 warn "removing commands"; 3865 trace "removing commands";
3775 %COMMAND = (); 3866 %COMMAND = ();
3776 3867
3777 warn "removing ext/exti commands"; 3868 trace "removing ext/exti commands";
3778 %EXTCMD = (); 3869 %EXTCMD = ();
3779 %EXTICMD = (); 3870 %EXTICMD = ();
3780 3871
3781 warn "unloading/nuking all extensions"; 3872 trace "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) { 3873 for my $pkg (@EXTS) {
3783 warn "... unloading $pkg"; 3874 trace "... unloading $pkg";
3784 3875
3785 if (my $cb = $pkg->can ("unload")) { 3876 if (my $cb = $pkg->can ("unload")) {
3786 eval { 3877 eval {
3787 $cb->($pkg); 3878 $cb->($pkg);
3788 1 3879 1
3789 } or warn "$pkg unloaded, but with errors: $@"; 3880 } or error "$pkg unloaded, but with errors: $@";
3790 } 3881 }
3791 3882
3792 warn "... clearing $pkg"; 3883 trace "... clearing $pkg";
3793 clear_package $pkg; 3884 clear_package $pkg;
3794 } 3885 }
3795 3886
3796 warn "unloading all perl modules loaded from $LIBDIR"; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) { 3888 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799 3890
3800 warn "... unloading $k"; 3891 trace "... unloading $k";
3801 delete $INC{$k}; 3892 delete $INC{$k};
3802 3893
3803 $k =~ s/\.pm$//; 3894 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g; 3895 $k =~ s/\//::/g;
3805 3896
… …
3808 } 3899 }
3809 3900
3810 clear_package $k; 3901 clear_package $k;
3811 } 3902 }
3812 3903
3813 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3814 clear_package "safe::$_" 3905 clear_package "safe::$_"
3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3816 3907
3817 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3818 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3820 3911
3821 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3822 # and global variables created in xs 3913 # and global variables created in xs
3823 #clear_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3824 3915
3825 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3826 3917
3827 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3828 require cf; 3919 require cf;
3829 cf::_connect_to_perl_1; 3920 cf::_connect_to_perl_1;
3830 3921
3831 warn "loading config and database again"; 3922 trace "loading config and database again";
3832 cf::reload_config; 3923 cf::reload_config;
3833 3924
3834 warn "loading extensions"; 3925 trace "loading extensions";
3835 cf::load_extensions; 3926 cf::load_extensions;
3836 3927
3837 if ($REATTACH_ON_RELOAD) { 3928 if ($REATTACH_ON_RELOAD) {
3838 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3839 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3840 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3841 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3842 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3843 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3844 } 3935 }
3845 3936
3846 warn "running post_init jobs"; 3937 trace "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT; 3938 (pop @POST_INIT)->(1) while @POST_INIT;
3848 3939
3849 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3850 3941
3851 1 3942 1
3852 } or do { 3943 } or do {
3853 warn $@; 3944 error $@;
3854 cf::cleanup "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3855 }; 3946 };
3856 3947
3857 warn "reloaded"; 3948 info "reloaded";
3858 --$RELOAD; 3949 --$RELOAD;
3859 } 3950 }
3860 3951
3861 $t1 = EV::time - $t1; 3952 $t1 = AE::time - $t1;
3862 warn "reload completed in ${t1}s\n"; 3953 info "reload completed in ${t1}s\n";
3863}; 3954};
3864 3955
3865our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3866 3957
3867sub reload_perl() { 3958sub reload_perl() {
… …
3869 # coro crashes during coro_state_free->destroy here. 3960 # coro crashes during coro_state_free->destroy here.
3870 3961
3871 $RELOAD_WATCHER ||= cf::async { 3962 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions; 3963 Coro::AIO::aio_wait cache_extensions;
3873 3964
3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3965 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3875 do_reload_perl; 3966 do_reload_perl;
3876 undef $RELOAD_WATCHER; 3967 undef $RELOAD_WATCHER;
3877 }; 3968 };
3878 }; 3969 };
3879} 3970}
… …
3896 3987
3897our @WAIT_FOR_TICK; 3988our @WAIT_FOR_TICK;
3898our @WAIT_FOR_TICK_BEGIN; 3989our @WAIT_FOR_TICK_BEGIN;
3899 3990
3900sub wait_for_tick { 3991sub wait_for_tick {
3901 return if tick_inhibit || $Coro::current == $Coro::main; 3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3902 3993
3903 my $signal = new Coro::Signal; 3994 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK, $signal; 3995 push @WAIT_FOR_TICK, $signal;
3905 $signal->wait; 3996 $signal->wait;
3906} 3997}
3907 3998
3908sub wait_for_tick_begin { 3999sub wait_for_tick_begin {
3909 return if tick_inhibit || $Coro::current == $Coro::main; 4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3910 4001
3911 my $signal = new Coro::Signal; 4002 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK_BEGIN, $signal; 4003 push @WAIT_FOR_TICK_BEGIN, $signal;
3913 $signal->wait; 4004 $signal->wait;
3914} 4005}
… …
3920 return; 4011 return;
3921 } 4012 }
3922 4013
3923 cf::server_tick; # one server iteration 4014 cf::server_tick; # one server iteration
3924 4015
4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017
3925 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3927 Coro::async_pool { 4020 Coro::async_pool {
3928 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3929 write_runtime_sync 4022 write_runtime_sync
3930 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3931 }; 4024 };
3932 } 4025 }
3933 4026
3934 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3935 $sig->send; 4028 $sig->send;
… …
3943 4036
3944 if (0) { 4037 if (0) {
3945 if ($NEXT_TICK) { 4038 if ($NEXT_TICK) {
3946 my $jitter = $TICK_START - $NEXT_TICK; 4039 my $jitter = $TICK_START - $NEXT_TICK;
3947 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3948 warn "jitter $JITTER\n";#d# 4041 debug "jitter $JITTER\n";#d#
3949 } 4042 }
3950 } 4043 }
3951} 4044}
3952 4045
3953{ 4046{
3954 # configure BDB 4047 # configure BDB
3955 4048
3956 BDB::min_parallel 8; 4049 BDB::min_parallel 16;
3957 BDB::max_poll_reqs $TICK * 0.1; 4050 BDB::max_poll_reqs $TICK * 0.1;
3958 $AnyEvent::BDB::WATCHER->priority (1); 4051 $AnyEvent::BDB::WATCHER->priority (1);
3959 4052
3960 unless ($DB_ENV) { 4053 unless ($DB_ENV) {
3961 $DB_ENV = BDB::db_env_create; 4054 $DB_ENV = BDB::db_env_create;

Diff Legend

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