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.506 by root, Wed Feb 3 20:48:22 2010 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %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;
112 118
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 121our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 127our $DB_ENV;
122 128
123our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 130
125our %CFG; 131our %CFG;
126 132
127our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 134our $RUNTIME;
… …
162 168
163our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
164 170
165sub cf::map::normalise; 171sub cf::map::normalise;
166 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
167############################################################################# 177#############################################################################
168 178
169%REFLECT = (); 179%REFLECT = ();
170for (@REFLECT) { 180for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 233from wherever your confdir points to.
224 234
225=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
226 236
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
230 245
231=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
232 247
233This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
242 257
243=back 258=back
244 259
245=cut 260=cut
246 261
262sub error(@) { LOG llevError, join "", @_ }
263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
247$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 269 my $msg = join "", @_;
249 270
250 $msg .= "\n" 271 $msg .= "\n"
251 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
252 273
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 275
255 LOG llevError, $msg; 276 LOG llevWarn, $msg;
256}; 277};
257 278
258$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
260 281
261 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
262 283
263 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 286 return;#d#
266 }#d# 287 }#d#
267 288
268 # kill coroutine otherwise 289 # kill coroutine otherwise
269 Coro::terminate 290 Coro::terminate
… …
396} 417}
397 418
398=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
399 420
400Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 422get spread over time.
402 423
403=cut 424=cut
404 425
405sub periodic($$) { 426sub periodic($$) {
406 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
… …
502=cut 523=cut
503 524
504sub sync_job(&) { 525sub sync_job(&) {
505 my ($job) = @_; 526 my ($job) = @_;
506 527
507 if ($Coro::current == $Coro::main) { 528 if (in_main) {
508 my $time = EV::time; 529 my $time = AE::time;
509 530
510 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
512 533
513 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
514 535
515 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
516 537
517 my $busy = 1; 538 my $busy = 1;
518 my @res; 539 my @res;
519 540
520 (async { 541 (async {
521 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 543 @res = eval { $job->() };
523 warn $@ if $@; 544 error $@ if $@;
524 undef $busy; 545 undef $busy;
525 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
526 547
527 while ($busy) { 548 while ($busy) {
528 if (Coro::nready) { 549 if (Coro::nready) {
… …
530 } else { 551 } else {
531 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
532 } 553 }
533 } 554 }
534 555
535 my $time = EV::time - $time; 556 my $time = AE::time - $time;
536 557
537 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
538 559
539 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
540 } else { 561 } else {
… …
571Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 593never block itself or use any form of event handling.
573 594
574=cut 595=cut
575 596
597sub post_fork {
598 reset_signals;
599}
600
576sub fork_call(&@) { 601sub fork_call(&@) {
577 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
578 603
579 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
582 607
583 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
584 reset_signals; 609 cf::post_fork;
585 &$cb 610 &$cb
586 }, @args; 611 }, @args;
587 612
588 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
614}
615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
589} 625}
590 626
591=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
592 628
593=cut 629=cut
… …
630within each server. 666within each server.
631 667
632=cut 668=cut
633 669
634sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
635 my ($name) = @_; 674 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
637 676
638 eval { 677 eval {
639 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
… …
649} 688}
650 689
651our $DB; 690our $DB;
652 691
653sub db_init { 692sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
656 };
657} 694}
658 695
659sub db_get($$) { 696sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
661 698
662 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
663 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
664 703
665 $! ? () 704 $! ? ()
666 : $data 705 : $data
667 }
668} 706}
669 707
670sub db_put($$$) { 708sub db_put($$$) {
671 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
728 766
729 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 768 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
732 770
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 772
735 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
738 776
… …
748 786
749=cut 787=cut
750 788
751sub datalog($@) { 789sub datalog($@) {
752 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 792}
755 793
756=back 794=back
757 795
758=cut 796=cut
… …
953 991
954 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 994
957 } elsif (ref $type) { 995 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
959 997
960 } else { 998 } else {
961 shift @arg; 999 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
963 } 1001 }
964 } 1002 }
965} 1003}
966 1004
967sub _object_attach { 1005sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
978 } 1016 }
979 1017
980 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
981 } else { 1019 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1021 }
984 1022
985 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
986} 1024}
987 1025
… …
1046 1084
1047 for (@$callbacks) { 1085 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1049 1087
1050 if ($@) { 1088 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1090 override;
1054 } 1091 }
1055 1092
1056 return 1 if $override; 1093 return 1 if $override;
1057 } 1094 }
… …
1136 for (@$attach) { 1173 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1139 } 1176 }
1140 } else { 1177 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1179 }
1143 } 1180 }
1144} 1181}
1145 1182
1146cf::attachable->attach ( 1183cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1174 1211
1175 sync_job { 1212 sync_job {
1176 if (length $$rdata) { 1213 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1180 1218
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1222 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1207 1245
1208 $filename =~ s%/[^/]+$%%; 1246 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1247 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1248 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1212 } 1250 }
1213 } else { 1251 } else {
1214 aio_unlink $filename; 1252 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1216 } 1254 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1279 $av = $st->{objs};
1242 } 1280 }
1243 1281
1244 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1247 1286
1248 ($data, $av) 1287 ($data, $av)
1249} 1288}
1250 1289
1251=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
… …
1310} 1349}
1311 1350
1312use File::Glob (); 1351use File::Glob ();
1313 1352
1314cf::player->attach ( 1353cf::player->attach (
1315 on_command => sub { 1354 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1317 1356
1318 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1319 or return; 1358 or return;
1320 1359
… …
1343 1382
1344 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1384 if $reply;
1346 1385
1347 } else { 1386 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1388 }
1350 1389
1351 cf::override; 1390 cf::override;
1352 }, 1391 },
1353); 1392);
… …
1364 1403
1365 $grp 1404 $grp
1366} 1405}
1367 1406
1368sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1369 cf::sync_job { 1410 cf::sync_job {
1370 my %todo; 1411 my %todo;
1371 1412
1372 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1414 next unless -r $path;
… …
1391 1432
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1435
1395 $ext{source} = 1436 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1398 . $source 1439 . $source
1399 . "\n};\n1"; 1440 . "\n};\n1";
1400 1441
1401 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1455 next ext
1415 unless exists $done{$_}; 1456 unless exists $done{$_};
1416 } 1457 }
1417 1458
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1460
1420 my $active = eval $v->{source}; 1461 my $active = eval $v->{source};
1421 1462
1422 if (length $@) { 1463 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1464 error "$v->{path}: $@\n";
1424 1465
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1467 if exists $v->{meta}{mandatory};
1468
1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1427 } else { 1471 } else {
1428 $done{$k} = delete $todo{$k}; 1472 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1473 push @EXTS, $v->{pkg};
1430 $progress = 1; 1474 $progress = 1;
1431 1475
1432 warn "$v->{base}: extension inactive.\n" 1476 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1477 unless $active;
1434 } 1478 }
1435 } 1479 }
1436 1480
1437 unless ($progress) { 1481 unless ($progress) {
… …
1533 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1534 } 1578 }
1535 } 1579 }
1536} 1580}
1537 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1538sub save($) { 1595sub save($) {
1539 my ($pl) = @_; 1596 my ($pl) = @_;
1540 1597
1541 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1542 1599
… …
1547 1604
1548 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1550 1607
1551 cf::get_slot 0.01; 1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1612
1553 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1614 cf::cede_to_tick;
1555} 1615}
1556 1616
… …
1592 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1594 1654
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1596 $pl->deactivate; 1656 $pl->deactivate;
1657
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1600 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1601 1663
1602 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1658 \@logins 1720 \@logins
1659} 1721}
1660 1722
1661=item $player->maps 1723=item $player->maps
1662 1724
1725=item cf::player::maps $login
1726
1663Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1664player. May block. 1728player. May block.
1665 1729
1666=cut 1730=cut
1667 1731
… …
1729=cut 1793=cut
1730 1794
1731sub find_by_path($) { 1795sub find_by_path($) {
1732 my ($path) = @_; 1796 my ($path) = @_;
1733 1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1799
1734 my ($match, $specificity); 1800 my ($match, $specificity);
1735 1801
1736 for my $region (list) { 1802 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity) 1804 ($match, $specificity) = ($region, $region->specificity)
… …
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770 1836
1771 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1838 $self->_create_random_map (
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1794 1860
1795sub register { 1861sub register {
1796 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 1863 my $pkg = caller;
1798 1864
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 1866
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1868}
1804 1869
1805# also paths starting with '/' 1870# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1872
1808sub thawer_merge { 1873sub thawer_merge {
1809 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1810 1875
1811 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
… …
1816} 1881}
1817 1882
1818sub normalise { 1883sub normalise {
1819 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1820 1885
1821 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1822 1887
1823 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1824 1889
1825 # map plan: 1890 # map plan:
1826 # 1891 #
… …
1865 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1866 return $self; 1931 return $self;
1867 } 1932 }
1868 } 1933 }
1869 1934
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 1936 ()
1872} 1937}
1873 1938
1874sub init { 1939sub init {
1875 my ($self) = @_; 1940 my ($self) = @_;
… …
1997} 2062}
1998 2063
1999sub find; 2064sub find;
2000sub find { 2065sub find {
2001 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2067
2068 cf::cede_to_tick;
2002 2069
2003 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
2004 2071
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2093 } 2160 }
2094 2161
2095 $self->post_load; 2162 $self->post_load;
2096} 2163}
2097 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2098sub customise_for { 2168sub customise_for {
2099 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2100 2170
2101 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2102 if $self->per_player; 2172 if $self->per_player;
… …
2118 or next; 2188 or next;
2119 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2120 or next; 2190 or next;
2121 $neigh->load; 2191 $neigh->load;
2122 2192
2193 # now find the diagonal neighbours
2123 push @neigh, 2194 push @neigh,
2124 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2125 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2126 } 2197 }
2127 2198
… …
2134} 2205}
2135 2206
2136sub find_sync { 2207sub find_sync {
2137 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2138 2209
2139 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2140} 2214}
2141 2215
2142sub do_load_sync { 2216sub do_load_sync {
2143 my ($map) = @_; 2217 my ($map) = @_;
2144 2218
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2147 2221
2148 cf::sync_job { $map->load }; 2222 $map->load;
2149} 2223}
2150 2224
2151our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2152our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2153 2227
… …
2179 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2180 2254
2181 () 2255 ()
2182} 2256}
2183 2257
2258# common code, used by both ->save and ->swapout
2184sub save { 2259sub _save {
2185 my ($self) = @_; 2260 my ($self) = @_;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2261
2189 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2190 2263
2191 return unless $self->dirty; 2264 return unless $self->dirty;
2192 2265
… …
2212 } else { 2285 } else {
2213 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2214 } 2287 }
2215} 2288}
2216 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2217sub swap_out { 2298sub swap_out {
2218 my ($self) = @_; 2299 my ($self) = @_;
2219 2300
2220 # save first because save cedes
2221 $self->save;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2302
2225 return if $self->players;
2226 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2227 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2228 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2230 2357
2231 $self->deactivate; 2358 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear; 2360 $self->clear;
2234}
2235
2236sub reset_at {
2237 my ($self) = @_;
2238
2239 # TODO: safety, remove and allow resettable per-player maps
2240 return 1e99 if $self->{deny_reset};
2241
2242 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2243 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2244
2245 $time + $to
2246}
2247
2248sub should_reset {
2249 my ($self) = @_;
2250
2251 $self->reset_at <= $cf::RUNTIME
2252}
2253
2254sub reset {
2255 my ($self) = @_;
2256
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2259 return if $self->players;
2260
2261 warn "resetting map ", $self->path, "\n";
2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 # need to save uniques path
2266 unless ($self->{deny_save}) {
2267 my $uniq = $self->uniq_path; utf8::encode $uniq;
2268
2269 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2270 if $uniq;
2271 }
2272
2273 delete $cf::MAP{$self->path};
2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
2277 $self->clear;
2278 2361
2279 $self->unlink_save; 2362 $self->unlink_save;
2280 $self->destroy; 2363 $self->destroy;
2281} 2364}
2282 2365
… …
2290 2373
2291 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2292 2375
2293 $self->unlink_save; 2376 $self->unlink_save;
2294 2377
2295 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2296 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2297 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2298 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2300 2383
… …
2530 2613
2531Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2532 2615
2533The player should be reasonably safe there for short amounts of time (e.g. 2616The player should be reasonably safe there for short amounts of time (e.g.
2534for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link 2618though, as the player cannot control the character while it is on the link
2536map. 2619map.
2537 2620
2538Will never block. 2621Will never block.
2539 2622
2540=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
… …
2561sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2562 my ($self) = @_; 2645 my ($self) = @_;
2563 2646
2564 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2565 2648
2649 ++$self->{_link_recursion};
2650
2566 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2567 2652
2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2570 2655
2571 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2572} 2657}
2573 2658
2574sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2575 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2576 2661
… …
2601 $map->load_neighbours; 2686 $map->load_neighbours;
2602 2687
2603 return unless $self->contr->active; 2688 return unless $self->contr->active;
2604 2689
2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2607 2692 # entering was successful
2693 delete $self->{_link_recursion};
2608 # only activate afterwards, to support waiting in hooks 2694 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive; 2695 $self->activate_recursive;
2610} 2696 }
2611 2697
2698}
2699
2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2613 2701
2614Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2615her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2616that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2617the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
… …
2624 2712
2625our $GOTOGEN; 2713our $GOTOGEN;
2626 2714
2627sub cf::object::player::goto { 2715sub cf::object::player::goto {
2628 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2629 2723
2630 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2726
2633 $self->enter_link; 2727 $self->enter_link;
… …
2657 my $map = eval { 2751 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2659 2753
2660 if ($map) { 2754 if ($map) {
2661 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2757 } else {
2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665 } 2759 }
2666 2760
2667 $map 2761 $map
… …
2675 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2678 } 2772 }
2679 2773
2680 $done->() if $done; 2774 $done->($self) if $done;
2681 })->prio (1); 2775 })->prio (1);
2682} 2776}
2683 2777
2684=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2685 2779
… …
2778 $self->message ("Something went wrong deep within the deliantra server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2876
2783 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 2878 $self->leave_link;
2785 } 2879 }
2786 })->prio (1); 2880 })->prio (1);
2787} 2881}
2788 2882
… …
3101 3195
3102 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3103 if $reply; 3197 if $reply;
3104 3198
3105 } else { 3199 } else {
3106 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3107 } 3201 }
3108 3202
3109 cf::override; 3203 cf::override;
3110 }, 3204 },
3111); 3205);
… …
3131 3225
3132 $coro 3226 $coro
3133} 3227}
3134 3228
3135cf::client->attach ( 3229cf::client->attach (
3136 on_destroy => sub { 3230 on_client_destroy => sub {
3137 my ($ns) = @_; 3231 my ($ns) = @_;
3138 3232
3139 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3140 }, 3234 },
3141); 3235);
… …
3192 decrease split destroy change_exp value msg lore send_msg)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3193 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3194 ["cf::player" => qw(peaceful send_msg)], 3288 ["cf::player" => qw(peaceful send_msg)],
3195 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3196) { 3290) {
3197 no strict 'refs';
3198 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3200 for @funs; 3293 for @funs;
3201} 3294}
3202 3295
… …
3241 local @cf::_safe_eval_args = values %vars; 3334 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval; 3335 @res = wantarray ? eval eval : scalar eval $eval;
3243 } 3336 }
3244 3337
3245 if ($@) { 3338 if ($@) {
3246 warn "$@"; 3339 warn "$@",
3247 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3248 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3249 } 3342 }
3250 3343
3251 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3252} 3345}
3253 3346
… …
3287 # for this (global event?) 3380 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3289 3382
3290 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3291 3384
3292 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3293 3386
3294 my $facedata;
3295 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3296 or die "$path: $!"; 3388 or die "$path: $!";
3297 3389
3298 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3299 3391
3300 $facedata->{version} == 2 3392 $facedata->{version} == 2
… …
3331 3423
3332 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335 } else { 3427 } else {
3336 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3337 } 3429 }
3338 3430
3339 cf::cede_to_tick; 3431 cf::cede_to_tick;
3340 } 3432 }
3341 } 3433 }
… …
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360 3452
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3363 } else { 3455 } else {
3364 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3365 } 3457 }
3366 3458
3367 cf::cede_to_tick; 3459 cf::cede_to_tick;
3368 } 3460 }
3369 } 3461 }
3370 3462
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372 3464
3373 1 3465 1
3374} 3466}
3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
3395 3467
3396register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3398 3470
3399 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
… …
3438sub reload_treasures { 3510sub reload_treasures {
3439 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3440 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3441} 3513}
3442 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3443sub reload_resources { 3538sub reload_resources {
3444 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3445 3540
3541 reload_exp_table;
3542 reload_materials;
3446 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3447 reload_archetypes; 3545 reload_archetypes;
3448 reload_regions; 3546 reload_regions;
3449 reload_treasures; 3547 reload_treasures;
3450 3548
3451 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3452} 3550}
3453 3551
3454sub reload_config { 3552sub reload_config {
3455 warn "reloading config file...\n"; 3553 trace "reloading config file...\n";
3456 3554
3457 open my $fh, "<:utf8", "$CONFDIR/config" 3555 0 < aio_load "$CONFDIR/config", my $config
3458 or return; 3556 or die "$CONFDIR/config: $!";
3459 3557
3460 local $/; 3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3461 *CFG = YAML::XS::Load scalar <$fh>; 3561 *CFG = YAML::XS::Load $config;
3462 3562
3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3464 3564
3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3467 3567
3468 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
… …
3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3570 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3471 and die "WARNING: m(un)lockall failed: $!\n"; 3571 and die "WARNING: m(un)lockall failed: $!\n";
3472 }; 3572 };
3473 warn $@ if $@; 3573 warn $@ if $@;
3474 } 3574 }
3475
3476 warn "finished reloading resource files\n";
3477} 3575}
3478 3576
3479sub pidfile() { 3577sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!"; 3579 or die "$PIDFILE: $!";
… …
3494 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3495 print $fh $$; 3593 print $fh $$;
3496} 3594}
3497 3595
3498sub main_loop { 3596sub main_loop {
3499 warn "EV::loop starting\n"; 3597 trace "EV::loop starting\n";
3500 if (1) { 3598 if (1) {
3501 EV::loop; 3599 EV::loop;
3502 } 3600 }
3503 warn "EV::loop returned\n"; 3601 trace "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP; 3602 goto &main_loop unless $REALLY_UNLOOP;
3505} 3603}
3506 3604
3507sub main { 3605sub main {
3508 cf::init_globals; # initialise logging 3606 cf::init_globals; # initialise logging
3509 3607
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519 3612
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521 3614
3522 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3523 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
… …
3529 }; 3622 };
3530 3623
3531 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3532 3625
3533 cf::sync_job { 3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3534 cf::load_settings; 3633 cf::load_settings;
3535 cf::load_materials;
3536 3634
3537 reload_resources; 3635 reload_resources;
3538 reload_config; 3636 reload_config;
3539 db_init; 3637 db_init;
3540 3638
3541 cf::init_uuid; 3639 cf::init_uuid;
3542 cf::init_signals; 3640 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills; 3641 cf::init_skills;
3545 3642
3546 cf::init_beforeplay; 3643 cf::init_beforeplay;
3547 3644
3548 atomic; 3645 atomic;
… …
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557 3654
3558 (pop @POST_INIT)->(0) while @POST_INIT; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3559 }; 3656 };
3560 3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3561 main_loop; 3666 goto &main_loop;
3562} 3667}
3563 3668
3564############################################################################# 3669#############################################################################
3565# initialisation and cleanup 3670# initialisation and cleanup
3566 3671
3567# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3568BEGIN { 3673BEGIN {
3569 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3570 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3571 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3572 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3573 }; 3678 };
3574 } 3679 }
3575} 3680}
3576 3681
3577sub write_runtime_sync { 3682sub write_runtime_sync {
3578 my $t0 = EV::time; 3683 my $t0 = AE::time;
3579 3684
3580 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3581 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3582 3687
3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3605 or return; 3710 or return;
3606 3711
3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3608 and return; 3713 and return;
3609 3714
3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3611 3716
3612 1 3717 1
3613} 3718}
3614 3719
3615our $uuid_lock; 3720our $uuid_lock;
… …
3627 or return; 3732 or return;
3628 3733
3629 my $value = uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3630 3735
3631 unless ($value) { 3736 unless ($value) {
3632 warn "cowardly refusing to write zero uuid value!\n"; 3737 info "cowardly refusing to write zero uuid value!\n";
3633 return; 3738 return;
3634 } 3739 }
3635 3740
3636 my $value = uuid_str $value + $uuid_skip; 3741 my $value = uuid_str $value + $uuid_skip;
3637 $uuid_skip = 0; 3742 $uuid_skip = 0;
… …
3647 or return; 3752 or return;
3648 3753
3649 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3650 and return; 3755 and return;
3651 3756
3652 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3653 3758
3654 1 3759 1
3655 3760
3656} 3761}
3657 3762
… …
3663} 3768}
3664 3769
3665sub emergency_save() { 3770sub emergency_save() {
3666 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3667 3772
3668 warn "emergency_perl_save: enter\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3669 3779
3670 cf::sync_job { 3780 cf::sync_job {
3671 # this is a trade-off: we want to be very quick here, so 3781 cf::write_runtime_sync; # external watchdog should not bark
3672 # save all maps without fsync, and later call a global sync
3673 # (which in turn might be very very slow)
3674 local $USE_FSYNC = 0;
3675 3782
3676 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3677 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3678 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3679 warn "emergency_perl_save: begin player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3680 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3681 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3682 $pl->valid or next; 3789 $pl->valid or next;
3683 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3684 $pl->save; 3791 $pl->save;
3685 } 3792 }
3686 warn "emergency_perl_save: end player save\n"; 3793 info "emergency_perl_save: end player save\n";
3687 3794
3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3688 warn "emergency_perl_save: begin map save\n"; 3797 info "emergency_perl_save: begin map save\n";
3689 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3690 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3691 $map->valid or next; 3800 $map->valid or next;
3692 $map->save; 3801 $map->save;
3693 } 3802 }
3694 warn "emergency_perl_save: end map save\n"; 3803 info "emergency_perl_save: end map save\n";
3695 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3696 warn "emergency_perl_save: begin database checkpoint\n"; 3807 info "emergency_perl_save: begin database checkpoint\n";
3697 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3698 warn "emergency_perl_save: end database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3699 3810
3700 warn "emergency_perl_save: begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3701 write_uuid_sync 1; 3812 write_uuid_sync 1;
3702 warn "emergency_perl_save: end write uuid\n"; 3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3703 }; 3833 };
3704 3834
3705 warn "emergency_perl_save: starting sync()\n";
3706 IO::AIO::aio_sync sub {
3707 warn "emergency_perl_save: finished sync()\n";
3708 };
3709
3710 warn "emergency_perl_save: leave\n"; 3835 info "emergency_perl_save: leave\n";
3711} 3836}
3712 3837
3713sub post_cleanup { 3838sub post_cleanup {
3714 my ($make_core) = @_; 3839 my ($make_core) = @_;
3715 3840
3841 IO::AIO::flush;
3842
3716 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3717 if $make_core; 3844 if $make_core;
3718 3845
3719 my $fh = pidfile; 3846 my $fh = pidfile;
3720 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3721} 3848}
… …
3741 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3742 for my $name (keys %$leaf_symtab) { 3869 for my $name (keys %$leaf_symtab) {
3743 _gv_clear *{"$pkg$name"}; 3870 _gv_clear *{"$pkg$name"};
3744# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3745 } 3872 }
3746 warn "cleared package $pkg\n";#d#
3747} 3873}
3748 3874
3749sub do_reload_perl() { 3875sub do_reload_perl() {
3750 # can/must only be called in main 3876 # can/must only be called in main
3751 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3752 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3753 return; 3879 return;
3754 } 3880 }
3755 3881
3756 return if $RELOAD++; 3882 return if $RELOAD++;
3757 3883
3758 my $t1 = EV::time; 3884 my $t1 = AE::time;
3759 3885
3760 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3761 warn "reloading..."; 3888 info "reloading...";
3762 3889
3763 warn "entering sync_job"; 3890 trace "entering sync_job";
3764 3891
3765 cf::sync_job { 3892 cf::sync_job {
3766 cf::write_runtime_sync; # external watchdog should not bark
3767 cf::emergency_save; 3893 #cf::emergency_save;
3768 cf::write_runtime_sync; # external watchdog should not bark
3769 3894
3770 warn "syncing database to disk";
3771 BDB::db_env_txn_checkpoint $DB_ENV;
3772
3773 # if anything goes wrong in here, we should simply crash as we already saved
3774
3775 warn "flushing outstanding aio requests";
3776 while (IO::AIO::nreqs || BDB::nreqs) {
3777 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3778 }
3779
3780 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3781 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3782 %EXT_CORO = (); 3897 %EXT_CORO = ();
3783 3898
3784 warn "removing commands"; 3899 trace "removing commands";
3785 %COMMAND = (); 3900 %COMMAND = ();
3786 3901
3787 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3788 %EXTCMD = (); 3903 %EXTCMD = ();
3789 %EXTICMD = (); 3904 %EXTICMD = ();
3790 3905
3791 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3792 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3793 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3794 3909
3795 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3796 eval { 3911 eval {
3797 $cb->($pkg); 3912 $cb->($pkg);
3798 1 3913 1
3799 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3800 } 3915 }
3801 3916
3802 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3803 clear_package $pkg; 3918 clear_package $pkg;
3804 } 3919 }
3805 3920
3806 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3807 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3808 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3809 3924
3810 warn "... unloading $k"; 3925 trace "... unloading $k";
3811 delete $INC{$k}; 3926 delete $INC{$k};
3812 3927
3813 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3814 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3815 3930
… …
3818 } 3933 }
3819 3934
3820 clear_package $k; 3935 clear_package $k;
3821 } 3936 }
3822 3937
3823 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3824 clear_package "safe::$_" 3939 clear_package "safe::$_"
3825 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3826 3941
3827 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3828 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3830 3945
3831 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3832 # and global variables created in xs 3947 # and global variables created in xs
3833 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3834 3949
3835 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3836 3951
3837 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3838 require cf; 3953 require cf;
3839 cf::_connect_to_perl_1; 3954 cf::_connect_to_perl_1;
3840 3955
3841 warn "loading config and database again"; 3956 trace "loading config and database again";
3842 cf::reload_config; 3957 cf::reload_config;
3843 3958
3844 warn "loading extensions"; 3959 trace "loading extensions";
3845 cf::load_extensions; 3960 cf::load_extensions;
3846 3961
3847 if ($REATTACH_ON_RELOAD) { 3962 if ($REATTACH_ON_RELOAD) {
3848 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3849 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3850 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3851 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3852 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3853 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3854 } 3969 }
3855 3970
3856 warn "running post_init jobs"; 3971 trace "running post_init jobs";
3857 (pop @POST_INIT)->(1) while @POST_INIT; 3972 (pop @POST_INIT)->(1) while @POST_INIT;
3858 3973
3859 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3860 3975
3861 1 3976 1
3862 } or do { 3977 } or do {
3863 warn $@; 3978 error $@;
3864 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3865 }; 3980 };
3866 3981
3867 warn "reloaded"; 3982 info "reloaded";
3868 --$RELOAD; 3983 --$RELOAD;
3869 } 3984 }
3870 3985
3871 $t1 = EV::time - $t1; 3986 $t1 = AE::time - $t1;
3872 warn "reload completed in ${t1}s\n"; 3987 info "reload completed in ${t1}s\n";
3873}; 3988};
3874 3989
3875our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3876 3991
3877sub reload_perl() { 3992sub reload_perl() {
… …
3879 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3880 3995
3881 $RELOAD_WATCHER ||= cf::async { 3996 $RELOAD_WATCHER ||= cf::async {
3882 Coro::AIO::aio_wait cache_extensions; 3997 Coro::AIO::aio_wait cache_extensions;
3883 3998
3884 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3885 do_reload_perl; 4000 do_reload_perl;
3886 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
3887 }; 4002 };
3888 }; 4003 };
3889} 4004}
… …
3898 reload_perl; 4013 reload_perl;
3899 }; 4014 };
3900 } 4015 }
3901}; 4016};
3902 4017
3903unshift @INC, $LIBDIR; 4018#############################################################################
3904 4019
3905my $bug_warning = 0; 4020my $bug_warning = 0;
3906 4021
3907our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3908our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3909 4024
3910sub wait_for_tick { 4025sub wait_for_tick() {
3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3912 4027
3913 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3914 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3915 $signal->wait; 4030 $signal->wait;
3916} 4031}
3917 4032
3918sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3920 4035
3921 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3922 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3923 $signal->wait; 4038 $signal->wait;
… …
3930 return; 4045 return;
3931 } 4046 }
3932 4047
3933 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3934 4049
3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3936 4051
3937 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3938 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3939 Coro::async_pool { 4054 Coro::async_pool {
3940 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3941 write_runtime_sync 4056 write_runtime_sync
3942 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3943 }; 4058 };
3944 } 4059 }
3945 4060
3946 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3947 $sig->send; 4062 $sig->send;
… …
3955 4070
3956 if (0) { 4071 if (0) {
3957 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3958 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3959 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3960 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3961 } 4076 }
3962 } 4077 }
3963} 4078}
3964 4079
3965{ 4080{

Diff Legend

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