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.497 by root, Fri Dec 18 03:49:46 2009 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 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.
… …
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) = @_;
… …
423 444
424=cut 445=cut
425 446
426our @SLOT_QUEUE; 447our @SLOT_QUEUE;
427our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
428 450
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
432 454
433 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
434 457
435 while () { 458 while () {
436 next_job: 459 next_job:
460
437 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 462
439 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 467 $job->[2]->send;
443 Coro::cede; 468 Coro::cede;
444 goto next_job; 469 goto next_job;
445 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 472 }
447 } 473 }
448 474
449 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 478 $signal->wait;
453 } else { 479 } else {
480 $busy = 0;
454 Coro::schedule; 481 Coro::schedule;
455 } 482 }
456 } 483 }
457}; 484};
458 485
459sub get_slot($;$$) { 486sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
461 488
462 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
463 490
464 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
465 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
466 494
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
… …
495=cut 523=cut
496 524
497sub sync_job(&) { 525sub sync_job(&) {
498 my ($job) = @_; 526 my ($job) = @_;
499 527
500 if ($Coro::current == $Coro::main) { 528 if (in_main) {
501 my $time = EV::time; 529 my $time = AE::time;
502 530
503 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
505 533
506 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
507 535
508 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
509 537
510 my $busy = 1; 538 my $busy = 1;
511 my @res; 539 my @res;
512 540
513 (async { 541 (async {
514 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 543 @res = eval { $job->() };
516 warn $@ if $@; 544 error $@ if $@;
517 undef $busy; 545 undef $busy;
518 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
519 547
520 while ($busy) { 548 while ($busy) {
521 if (Coro::nready) { 549 if (Coro::nready) {
… …
523 } else { 551 } else {
524 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
525 } 553 }
526 } 554 }
527 555
528 my $time = EV::time - $time; 556 my $time = AE::time - $time;
529 557
530 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
531 559
532 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
533 } else { 561 } else {
… …
577 reset_signals; 605 reset_signals;
578 &$cb 606 &$cb
579 }, @args; 607 }, @args;
580 608
581 wantarray ? @res : $res[-1] 609 wantarray ? @res : $res[-1]
610}
611
612sub objinfo {
613 (
614 "counter value" => cf::object::object_count,
615 "objects created" => cf::object::create_count,
616 "objects destroyed" => cf::object::destroy_count,
617 "freelist size" => cf::object::free_count,
618 "allocated objects" => cf::object::objects_size,
619 "active objects" => cf::object::actives_size,
620 )
582} 621}
583 622
584=item $coin = coin_from_name $name 623=item $coin = coin_from_name $name
585 624
586=cut 625=cut
… …
623within each server. 662within each server.
624 663
625=cut 664=cut
626 665
627sub db_table($) { 666sub db_table($) {
667 cf::error "db_get called from main context"
668 if $Coro::current == $Coro::main;
669
628 my ($name) = @_; 670 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 671 my $db = BDB::db_create $DB_ENV;
630 672
631 eval { 673 eval {
632 $db->set_flags (BDB::CHKSUM); 674 $db->set_flags (BDB::CHKSUM);
… …
642} 684}
643 685
644our $DB; 686our $DB;
645 687
646sub db_init { 688sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 689 $DB ||= db_table "db";
649 };
650} 690}
651 691
652sub db_get($$) { 692sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
654 694
655 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
656 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
657 699
658 $! ? () 700 $! ? ()
659 : $data 701 : $data
660 }
661} 702}
662 703
663sub db_put($$$) { 704sub db_put($$$) {
664 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
721 762
722 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 764 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
725 766
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 768
728 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
731 772
… …
741 782
742=cut 783=cut
743 784
744sub datalog($@) { 785sub datalog($@) {
745 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 788}
748 789
749=back 790=back
750 791
751=cut 792=cut
… …
946 987
947 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 990
950 } elsif (ref $type) { 991 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
952 993
953 } else { 994 } else {
954 shift @arg; 995 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
956 } 997 }
957 } 998 }
958} 999}
959 1000
960sub _object_attach { 1001sub _object_attach {
… …
970 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
971 } 1012 }
972 1013
973 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
974 } else { 1015 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1017 }
977 1018
978 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
979} 1020}
980 1021
… …
1039 1080
1040 for (@$callbacks) { 1081 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
1042 1083
1043 if ($@) { 1084 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1086 override;
1047 } 1087 }
1048 1088
1049 return 1 if $override; 1089 return 1 if $override;
1050 } 1090 }
… …
1129 for (@$attach) { 1169 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
1132 } 1172 }
1133 } else { 1173 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1175 }
1136 } 1176 }
1137} 1177}
1138 1178
1139cf::attachable->attach ( 1179cf::attachable->attach (
… …
1166 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1167 1207
1168 sync_job { 1208 sync_job {
1169 if (length $$rdata) { 1209 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1212 $decname, length $$rdata, scalar @$objs
1213 if $VERBOSE_IO;
1173 1214
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1216 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1218 if ($cf::USE_FSYNC) {
… …
1199 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1200 1241
1201 $filename =~ s%/[^/]+$%%; 1242 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1243 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1244 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1205 } 1246 }
1206 } else { 1247 } else {
1207 aio_unlink $filename; 1248 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1209 } 1250 }
… …
1233 my $st = eval { Coro::Storable::thaw $av }; 1274 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1275 $av = $st->{objs};
1235 } 1276 }
1236 1277
1237 utf8::decode (my $decname = $filename); 1278 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1280 $decname, length $data, scalar @{$av || []}
1281 if $VERBOSE_IO;
1240 1282
1241 ($data, $av) 1283 ($data, $av)
1242} 1284}
1243 1285
1244=head2 COMMAND CALLBACKS 1286=head2 COMMAND CALLBACKS
… …
1303} 1345}
1304 1346
1305use File::Glob (); 1347use File::Glob ();
1306 1348
1307cf::player->attach ( 1349cf::player->attach (
1308 on_command => sub { 1350 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1351 my ($pl, $name, $params) = @_;
1310 1352
1311 my $cb = $COMMAND{$name} 1353 my $cb = $COMMAND{$name}
1312 or return; 1354 or return;
1313 1355
… …
1336 1378
1337 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1338 if $reply; 1380 if $reply;
1339 1381
1340 } else { 1382 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1384 }
1343 1385
1344 cf::override; 1386 cf::override;
1345 }, 1387 },
1346); 1388);
… …
1357 1399
1358 $grp 1400 $grp
1359} 1401}
1360 1402
1361sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1362 cf::sync_job { 1406 cf::sync_job {
1363 my %todo; 1407 my %todo;
1364 1408
1365 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1410 next unless -r $path;
… …
1384 1428
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1431
1388 $ext{source} = 1432 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1391 . $source 1435 . $source
1392 . "\n};\n1"; 1436 . "\n};\n1";
1393 1437
1394 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
1395 } 1439 }
1396 1440
1441 my $pass = 0;
1397 my %done; 1442 my %done;
1398 while (%todo) { 1443 while (%todo) {
1399 my $progress; 1444 my $progress;
1400 1445
1446 ++$pass;
1447
1448 ext:
1401 while (my ($k, $v) = each %todo) { 1449 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1451 next ext
1404 unless exists $done{$_}; 1452 unless exists $done{$_};
1405 } 1453 }
1406 1454
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1456
1409 unless (eval $v->{source}) { 1457 my $active = eval $v->{source};
1458
1459 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1460 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1461
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1463 if exists $v->{meta}{mandatory};
1417 1464
1418 warn $msg; 1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1466 delete $todo{$k};
1467 } else {
1468 $done{$k} = delete $todo{$k};
1469 push @EXTS, $v->{pkg};
1470 $progress = 1;
1471
1472 info "$v->{base}: extension inactive.\n"
1473 unless $active;
1419 } 1474 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1475 }
1425 1476
1426 skip: 1477 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1478 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1479
1480 while (my ($k, $v) = each %todo) {
1481 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1482 if exists $v->{meta}{mandatory};
1483 }
1484 }
1429 } 1485 }
1430 }; 1486 };
1431} 1487}
1432 1488
1433############################################################################# 1489#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1573 $cf::PLAYER{$login} = $pl
1518 } 1574 }
1519 } 1575 }
1520} 1576}
1521 1577
1578cf::player->attach (
1579 on_load => sub {
1580 my ($pl, $path) = @_;
1581
1582 # restore slots saved in save, below
1583 my $slots = delete $pl->{_slots};
1584
1585 $pl->ob->current_weapon ($slots->[0]);
1586 $pl->combat_ob ($slots->[1]);
1587 $pl->ranged_ob ($slots->[2]);
1588 },
1589);
1590
1522sub save($) { 1591sub save($) {
1523 my ($pl) = @_; 1592 my ($pl) = @_;
1524 1593
1525 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1526 1595
… …
1531 1600
1532 aio_mkdir playerdir $pl, 0770; 1601 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1602 $pl->{last_save} = $cf::RUNTIME;
1534 1603
1535 cf::get_slot 0.01; 1604 cf::get_slot 0.01;
1605
1606 # save slots, to be restored later
1607 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1608
1537 $pl->save_pl ($path); 1609 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1610 cf::cede_to_tick;
1539} 1611}
1540 1612
… …
1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1649 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1578 1650
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1580 $pl->deactivate; 1652 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1653 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1584 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1585 1656
1586 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1642 \@logins 1713 \@logins
1643} 1714}
1644 1715
1645=item $player->maps 1716=item $player->maps
1646 1717
1718=item cf::player::maps $login
1719
1647Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1648player. May block. 1721player. May block.
1649 1722
1650=cut 1723=cut
1651 1724
… …
1713=cut 1786=cut
1714 1787
1715sub find_by_path($) { 1788sub find_by_path($) {
1716 my ($path) = @_; 1789 my ($path) = @_;
1717 1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1792
1718 my ($match, $specificity); 1793 my ($match, $specificity);
1719 1794
1720 for my $region (list) { 1795 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1797 ($match, $specificity) = ($region, $region->specificity)
… …
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1828 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1829
1755 # mit "rum" bekleckern, nicht 1830 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1831 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1832 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1833 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1834 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1835 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1836 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1837 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1838 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1778 1853
1779sub register { 1854sub register {
1780 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1856 my $pkg = caller;
1782 1857
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1859
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1861}
1788 1862
1789# also paths starting with '/' 1863# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1865
1792sub thawer_merge { 1866sub thawer_merge {
1793 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1794 1868
1795 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
… …
1800} 1874}
1801 1875
1802sub normalise { 1876sub normalise {
1803 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1804 1878
1805 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1806 1880
1807 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1808 1882
1809 # map plan: 1883 # map plan:
1810 # 1884 #
… …
1849 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1850 return $self; 1924 return $self;
1851 } 1925 }
1852 } 1926 }
1853 1927
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 1929 ()
1856} 1930}
1857 1931
1858sub init { 1932sub init {
1859 my ($self) = @_; 1933 my ($self) = @_;
… …
1981} 2055}
1982 2056
1983sub find; 2057sub find;
1984sub find { 2058sub find {
1985 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
2060
2061 cf::cede_to_tick;
1986 2062
1987 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
1988 2064
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2009 2085
2010 $cf::MAP{$path} = $map 2086 $cf::MAP{$path} = $map
2011 } 2087 }
2012} 2088}
2013 2089
2014sub pre_load { } 2090sub pre_load { }
2015sub post_load { } 2091#sub post_load { } # XS
2016 2092
2017sub load { 2093sub load {
2018 my ($self) = @_; 2094 my ($self) = @_;
2019 2095
2020 local $self->{deny_reset} = 1; # loading can take a long time 2096 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2153 }
2078 2154
2079 $self->post_load; 2155 $self->post_load;
2080} 2156}
2081 2157
2158# customize the map for a given player, i.e.
2159# return the _real_ map. used by e.g. per-player
2160# maps to change the path to ~playername/mappath
2082sub customise_for { 2161sub customise_for {
2083 my ($self, $ob) = @_; 2162 my ($self, $ob) = @_;
2084 2163
2085 return find "~" . $ob->name . "/" . $self->{path} 2164 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2165 if $self->per_player;
… …
2102 or next; 2181 or next;
2103 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
2104 or next; 2183 or next;
2105 $neigh->load; 2184 $neigh->load;
2106 2185
2186 # now find the diagonal neighbours
2107 push @neigh, 2187 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2190 }
2111 2191
… …
2118} 2198}
2119 2199
2120sub find_sync { 2200sub find_sync {
2121 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2122 2202
2123 cf::sync_job { find $path, $origin } 2203 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204 if $Coro::current == $Coro::main;
2205
2206 find $path, $origin
2124} 2207}
2125 2208
2126sub do_load_sync { 2209sub do_load_sync {
2127 my ($map) = @_; 2210 my ($map) = @_;
2128 2211
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2131 2214
2132 cf::sync_job { $map->load }; 2215 $map->load;
2133} 2216}
2134 2217
2135our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2137 2220
… …
2163 $MAP_PREFETCHER->prio (6); 2246 $MAP_PREFETCHER->prio (6);
2164 2247
2165 () 2248 ()
2166} 2249}
2167 2250
2251# common code, used by both ->save and ->swapout
2168sub save { 2252sub _save {
2169 my ($self) = @_; 2253 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2254
2173 $self->{last_save} = $cf::RUNTIME; 2255 $self->{last_save} = $cf::RUNTIME;
2174 2256
2175 return unless $self->dirty; 2257 return unless $self->dirty;
2176 2258
… …
2196 } else { 2278 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2279 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2280 }
2199} 2281}
2200 2282
2283sub save {
2284 my ($self) = @_;
2285
2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287
2288 $self->_save;
2289}
2290
2201sub swap_out { 2291sub swap_out {
2202 my ($self) = @_; 2292 my ($self) = @_;
2203 2293
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2295
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2296 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2297 return if $self->{deny_save};
2298 return if $self->players;
2212 2299
2300 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # then atomically save
2306 $self->_save;
2307
2308 # then free the map
2309 $self->clear;
2310}
2311
2312sub reset_at {
2313 my ($self) = @_;
2314
2315 # TODO: safety, remove and allow resettable per-player maps
2316 return 1e99 if $self->{deny_reset};
2317
2318 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2319 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2320
2321 $time + $to
2322}
2323
2324sub should_reset {
2325 my ($self) = @_;
2326
2327 $self->reset_at <= $cf::RUNTIME
2328}
2329
2330sub reset {
2331 my ($self) = @_;
2332
2333 my $lock = cf::lock_acquire "map_data:$self->{path}";
2334
2335 return if $self->players;
2336
2337 cf::trace "resetting map ", $self->path, "\n";
2338
2339 $self->in_memory (cf::MAP_SWAPPED);
2340
2341 # need to save uniques path
2342 unless ($self->{deny_save}) {
2343 my $uniq = $self->uniq_path; utf8::encode $uniq;
2344
2345 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2346 if $uniq;
2347 }
2348
2349 delete $cf::MAP{$self->path};
2214 2350
2215 $self->deactivate; 2351 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2352 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2353 $self->clear;
2218}
2219
2220sub reset_at {
2221 my ($self) = @_;
2222
2223 # TODO: safety, remove and allow resettable per-player maps
2224 return 1e99 if $self->{deny_reset};
2225
2226 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229 $time + $to
2230}
2231
2232sub should_reset {
2233 my ($self) = @_;
2234
2235 $self->reset_at <= $cf::RUNTIME
2236}
2237
2238sub reset {
2239 my ($self) = @_;
2240
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243 return if $self->players;
2244
2245 warn "resetting map ", $self->path, "\n";
2246
2247 $self->in_memory (cf::MAP_SWAPPED);
2248
2249 # need to save uniques path
2250 unless ($self->{deny_save}) {
2251 my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2254 if $uniq;
2255 }
2256
2257 delete $cf::MAP{$self->path};
2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->clear;
2262 2354
2263 $self->unlink_save; 2355 $self->unlink_save;
2264 $self->destroy; 2356 $self->destroy;
2265} 2357}
2266 2358
… …
2274 2366
2275 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2276 2368
2277 $self->unlink_save; 2369 $self->unlink_save;
2278 2370
2279 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2376
… …
2514 2606
2515Freezes the player and moves him/her to a special map (C<{link}>). 2607Freezes the player and moves him/her to a special map (C<{link}>).
2516 2608
2517The player should be reasonably safe there for short amounts of time (e.g. 2609The player should be reasonably safe there for short amounts of time (e.g.
2518for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2610for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link 2611though, as the player cannot control the character while it is on the link
2520map. 2612map.
2521 2613
2522Will never block. 2614Will never block.
2523 2615
2524=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
… …
2545sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2546 my ($self) = @_; 2638 my ($self) = @_;
2547 2639
2548 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2549 2641
2642 ++$self->{_link_recursion};
2643
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2645
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2554 2648
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2650}
2557 2651
2558sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2560 2654
… …
2585 $map->load_neighbours; 2679 $map->load_neighbours;
2586 2680
2587 return unless $self->contr->active; 2681 return unless $self->contr->active;
2588 2682
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2591 2685 # entering was successful
2686 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2687 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2688 $self->activate_recursive;
2594} 2689 }
2595 2690
2691}
2692
2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2693=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597 2694
2598Moves the player to the given map-path and coordinates by first freezing 2695Moves the player to the given map-path and coordinates by first freezing
2599her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2600that has to return the map if sucecssful, and then unfreezes the player on 2697that has to return the map if sucecssful, and then unfreezes the player on
2601the new (success) or old (failed) map position. In either case, $done will 2698the new (success) or old (failed) map position. In either case, $done will
… …
2608 2705
2609our $GOTOGEN; 2706our $GOTOGEN;
2610 2707
2611sub cf::object::player::goto { 2708sub cf::object::player::goto {
2612 my ($self, $path, $x, $y, $check, $done) = @_; 2709 my ($self, $path, $x, $y, $check, $done) = @_;
2710
2711 if ($self->{_link_recursion} >= $MAX_LINKS) {
2712 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2713 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2714 ($path, $x, $y) = @$EMERGENCY_POSITION;
2715 }
2613 2716
2614 # do generation counting so two concurrent goto's will be executed in-order 2717 # do generation counting so two concurrent goto's will be executed in-order
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2719
2617 $self->enter_link; 2720 $self->enter_link;
… …
2641 my $map = eval { 2744 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2745 my $map = defined $path ? cf::map::find $path : undef;
2643 2746
2644 if ($map) { 2747 if ($map) {
2645 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2750 } else {
2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2751 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649 } 2752 }
2650 2753
2651 $map 2754 $map
… …
2659 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2662 } 2765 }
2663 2766
2664 $done->() if $done; 2767 $done->($self) if $done;
2665 })->prio (1); 2768 })->prio (1);
2666} 2769}
2667 2770
2668=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2669 2772
… …
2762 $self->message ("Something went wrong deep within the deliantra server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2763 . "I'll try to bring you back to the map you were before. " 2866 . "I'll try to bring you back to the map you were before. "
2764 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2765 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2766 2869
2767 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2768 $self->leave_link; 2871 $self->leave_link;
2769 } 2872 }
2770 })->prio (1); 2873 })->prio (1);
2771} 2874}
2772 2875
… …
3085 3188
3086 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
3087 if $reply; 3190 if $reply;
3088 3191
3089 } else { 3192 } else {
3090 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3193 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3091 } 3194 }
3092 3195
3093 cf::override; 3196 cf::override;
3094 }, 3197 },
3095); 3198);
… …
3115 3218
3116 $coro 3219 $coro
3117} 3220}
3118 3221
3119cf::client->attach ( 3222cf::client->attach (
3120 on_destroy => sub { 3223 on_client_destroy => sub {
3121 my ($ns) = @_; 3224 my ($ns) = @_;
3122 3225
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3226 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3227 },
3125); 3228);
… …
3141our $safe_hole = new Safe::Hole; 3244our $safe_hole = new Safe::Hole;
3142 3245
3143$SIG{FPE} = 'IGNORE'; 3246$SIG{FPE} = 'IGNORE';
3144 3247
3145$safe->permit_only (Opcode::opset qw( 3248$safe->permit_only (Opcode::opset qw(
3146 :base_core :base_mem :base_orig :base_math 3249 :base_core :base_mem :base_orig :base_math :base_loop
3147 grepstart grepwhile mapstart mapwhile 3250 grepstart grepwhile mapstart mapwhile
3148 sort time 3251 sort time
3149)); 3252));
3150 3253
3151# here we export the classes and methods available to script code 3254# here we export the classes and methods available to script code
… …
3176 decrease split destroy change_exp value msg lore send_msg)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3177 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3178 ["cf::player" => qw(peaceful send_msg)], 3281 ["cf::player" => qw(peaceful send_msg)],
3179 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3180) { 3283) {
3181 no strict 'refs';
3182 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184 for @funs; 3286 for @funs;
3185} 3287}
3186 3288
… …
3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3305 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3204 $qcode =~ s/\n/\\n/g; 3306 $qcode =~ s/\n/\\n/g;
3205 3307
3206 %vars = (_dummy => 0) unless %vars; 3308 %vars = (_dummy => 0) unless %vars;
3207 3309
3310 my @res;
3208 local $_; 3311 local $_;
3209 local @safe::cf::_safe_eval_args = values %vars;
3210 3312
3211 my $eval = 3313 my $eval =
3212 "do {\n" 3314 "do {\n"
3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3315 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3214 . "#line 0 \"{$qcode}\"\n" 3316 . "#line 0 \"{$qcode}\"\n"
3215 . $code 3317 . $code
3216 . "\n}" 3318 . "\n}"
3217 ; 3319 ;
3218 3320
3321 if ($CFG{safe_eval}) {
3219 sub_generation_inc; 3322 sub_generation_inc;
3323 local @safe::cf::_safe_eval_args = values %vars;
3220 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3324 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3221 sub_generation_inc; 3325 sub_generation_inc;
3326 } else {
3327 local @cf::_safe_eval_args = values %vars;
3328 @res = wantarray ? eval eval : scalar eval $eval;
3329 }
3222 3330
3223 if ($@) { 3331 if ($@) {
3224 warn "$@"; 3332 warn "$@",
3225 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3226 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3227 } 3335 }
3228 3336
3229 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3230} 3338}
3231 3339
… …
3245=cut 3353=cut
3246 3354
3247sub register_script_function { 3355sub register_script_function {
3248 my ($fun, $cb) = @_; 3356 my ($fun, $cb) = @_;
3249 3357
3250 no strict 'refs'; 3358 $fun = "safe::$fun" if $CFG{safe_eval};
3251 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3359 *$fun = $safe_hole->wrap ($cb);
3252} 3360}
3253 3361
3254=back 3362=back
3255 3363
3256=cut 3364=cut
… …
3265 # for this (global event?) 3373 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3267 3375
3268 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3269 3377
3270 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3271 3379
3272 my $facedata;
3273 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3274 or die "$path: $!"; 3381 or die "$path: $!";
3275 3382
3276 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3277 3384
3278 $facedata->{version} == 2 3385 $facedata->{version} == 2
3279 or cf::cleanup "$path: version mismatch, cannot proceed."; 3386 or cf::cleanup "$path: version mismatch, cannot proceed.";
3280 3387
3281 # patch in the exptable 3388 # patch in the exptable
3389 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3282 $facedata->{resource}{"res/exp_table"} = { 3390 $facedata->{resource}{"res/exp_table"} = {
3283 type => FT_RSRC, 3391 type => FT_RSRC,
3284 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3392 data => $exp_table,
3393 hash => (Digest::MD5::md5 $exp_table),
3285 }; 3394 };
3286 cf::cede_to_tick; 3395 cf::cede_to_tick;
3287 3396
3288 { 3397 {
3289 my $faces = $facedata->{faceinfo}; 3398 my $faces = $facedata->{faceinfo};
… …
3307 3416
3308 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3309 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3310 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3311 } else { 3420 } else {
3312 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3313 } 3422 }
3314 3423
3315 cf::cede_to_tick; 3424 cf::cede_to_tick;
3316 } 3425 }
3317 } 3426 }
… …
3335 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3336 3445
3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3338 cf::face::set_type $idx, $info->{type}; 3447 cf::face::set_type $idx, $info->{type};
3339 } else { 3448 } else {
3340 $RESOURCE{$name} = $info; 3449 $RESOURCE{$name} = $info; # unused
3341 } 3450 }
3342 3451
3343 cf::cede_to_tick; 3452 cf::cede_to_tick;
3344 } 3453 }
3345 } 3454 }
3346 3455
3347 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3348 3457
3349 1 3458 1
3350} 3459}
3351
3352cf::global->attach (on_resource_update => sub {
3353 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3354 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3355
3356 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3357 my $sound = $soundconf->{compat}[$_]
3358 or next;
3359
3360 my $face = cf::face::find "sound/$sound->[1]";
3361 cf::sound::set $sound->[0] => $face;
3362 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3363 }
3364
3365 while (my ($k, $v) = each %{$soundconf->{event}}) {
3366 my $face = cf::face::find "sound/$v";
3367 cf::sound::set $k => $face;
3368 }
3369 }
3370});
3371 3460
3372register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
3373 my ($ns, $want) = @_; 3462 my ($ns, $want) = @_;
3374 3463
3375 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
… …
3414sub reload_treasures { 3503sub reload_treasures {
3415 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3416 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3417} 3506}
3418 3507
3508sub reload_sound {
3509 trace "loading sound config from $DATADIR/sound\n";
3510
3511 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512 or die "$DATADIR/sound $!";
3513
3514 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3515
3516 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517 my $sound = $soundconf->{compat}[$_]
3518 or next;
3519
3520 my $face = cf::face::find "sound/$sound->[1]";
3521 cf::sound::set $sound->[0] => $face;
3522 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3523 }
3524
3525 while (my ($k, $v) = each %{$soundconf->{event}}) {
3526 my $face = cf::face::find "sound/$v";
3527 cf::sound::set $k => $face;
3528 }
3529}
3530
3419sub reload_resources { 3531sub reload_resources {
3420 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3421 3533
3534 reload_exp_table;
3535 reload_materials;
3422 reload_facedata; 3536 reload_facedata;
3537 reload_sound;
3423 reload_archetypes; 3538 reload_archetypes;
3424 reload_regions; 3539 reload_regions;
3425 reload_treasures; 3540 reload_treasures;
3426 3541
3427 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3428} 3543}
3429 3544
3430sub reload_config { 3545sub reload_config {
3431 warn "reloading config file...\n"; 3546 trace "reloading config file...\n";
3432 3547
3433 open my $fh, "<:utf8", "$CONFDIR/config" 3548 0 < aio_load "$CONFDIR/config", my $config
3434 or return; 3549 or die "$CONFDIR/config: $!";
3435 3550
3436 local $/; 3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3437 *CFG = YAML::XS::Load scalar <$fh>; 3554 *CFG = YAML::XS::Load $config;
3438 3555
3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3440 3557
3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3558 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3559 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3443 3560
3444 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
… …
3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3563 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3447 and die "WARNING: m(un)lockall failed: $!\n"; 3564 and die "WARNING: m(un)lockall failed: $!\n";
3448 }; 3565 };
3449 warn $@ if $@; 3566 warn $@ if $@;
3450 } 3567 }
3451
3452 warn "finished reloading resource files\n";
3453} 3568}
3454 3569
3455sub pidfile() { 3570sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3571 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!"; 3572 or die "$PIDFILE: $!";
… …
3470 seek $fh, 0, 0; 3585 seek $fh, 0, 0;
3471 print $fh $$; 3586 print $fh $$;
3472} 3587}
3473 3588
3474sub main_loop { 3589sub main_loop {
3475 warn "EV::loop starting\n"; 3590 trace "EV::loop starting\n";
3476 if (1) { 3591 if (1) {
3477 EV::loop; 3592 EV::loop;
3478 } 3593 }
3479 warn "EV::loop returned\n"; 3594 trace "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP; 3595 goto &main_loop unless $REALLY_UNLOOP;
3481} 3596}
3482 3597
3483sub main { 3598sub main {
3484 cf::init_globals; # initialise logging 3599 cf::init_globals; # initialise logging
3485 3600
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3602 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3604 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495 3605
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3606 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497 3607
3498 # we must not ever block the main coroutine 3608 # we must not ever block the main coroutine
3499 local $Coro::idle = sub { 3609 local $Coro::idle = sub {
… …
3505 }; 3615 };
3506 3616
3507 evthread_start IO::AIO::poll_fileno; 3617 evthread_start IO::AIO::poll_fileno;
3508 3618
3509 cf::sync_job { 3619 cf::sync_job {
3620 cf::incloader::init ();
3621
3622 cf::init_anim;
3623 cf::init_attackmess;
3624 cf::init_dynamic;
3625
3510 cf::load_settings; 3626 cf::load_settings;
3511 cf::load_materials;
3512 3627
3513 reload_resources; 3628 reload_resources;
3514 reload_config; 3629 reload_config;
3515 db_init; 3630 db_init;
3516 3631
3517 cf::init_uuid; 3632 cf::init_uuid;
3518 cf::init_signals; 3633 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills; 3634 cf::init_skills;
3521 3635
3522 cf::init_beforeplay; 3636 cf::init_beforeplay;
3523 3637
3524 atomic; 3638 atomic;
… …
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3646 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533 3647
3534 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3535 }; 3649 };
3536 3650
3651 cf::object::thawer::errors_are_fatal 0;
3652 info "parse errors in files are no longer fatal from this point on.\n";
3653
3654 my $free_main; $free_main = EV::idle sub {
3655 undef $free_main;
3656 undef &main; # free gobs of memory :)
3657 };
3658
3537 main_loop; 3659 goto &main_loop;
3538} 3660}
3539 3661
3540############################################################################# 3662#############################################################################
3541# initialisation and cleanup 3663# initialisation and cleanup
3542 3664
3543# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3544BEGIN { 3666BEGIN {
3545 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3546 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3547 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3548 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3549 }; 3671 };
3550 } 3672 }
3551} 3673}
3552 3674
3553sub write_runtime_sync { 3675sub write_runtime_sync {
3676 my $t0 = AE::time;
3677
3554 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3555 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3556 3680
3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3558 3682
3559 my $guard = cf::lock_acquire "write_runtime"; 3683 my $guard = cf::lock_acquire "write_runtime";
3560 3684
3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3685 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3562 or return; 3686 or return;
3563 3687
3564 my $value = $cf::RUNTIME + 90 + 10; 3688 my $value = $cf::RUNTIME + 90 + 10;
3565 # 10 is the runtime save interval, for a monotonic clock 3689 # 10 is the runtime save interval, for a monotonic clock
3566 # 60 allows for the watchdog to kill the server. 3690 # 60 allows for the watchdog to kill the server.
… …
3579 or return; 3703 or return;
3580 3704
3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3582 and return; 3706 and return;
3583 3707
3584 warn "runtime file written.\n"; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3585 3709
3586 1 3710 1
3587} 3711}
3588 3712
3589our $uuid_lock; 3713our $uuid_lock;
… …
3601 or return; 3725 or return;
3602 3726
3603 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3604 3728
3605 unless ($value) { 3729 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3607 return; 3731 return;
3608 } 3732 }
3609 3733
3610 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3611 $uuid_skip = 0; 3735 $uuid_skip = 0;
… …
3621 or return; 3745 or return;
3622 3746
3623 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3624 and return; 3748 and return;
3625 3749
3626 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3627 3751
3628 1 3752 1
3629 3753
3630} 3754}
3631 3755
… …
3637} 3761}
3638 3762
3639sub emergency_save() { 3763sub emergency_save() {
3640 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3641 3765
3642 warn "emergency_perl_save: enter\n"; 3766 info "emergency_perl_save: enter\n";
3767
3768 # this is a trade-off: we want to be very quick here, so
3769 # save all maps without fsync, and later call a global sync
3770 # (which in turn might be very very slow)
3771 local $USE_FSYNC = 0;
3643 3772
3644 cf::sync_job { 3773 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so 3774 cf::write_runtime_sync; # external watchdog should not bark
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649 3775
3650 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3651 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3652 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3653 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3654 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3655 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3656 $pl->valid or next; 3782 $pl->valid or next;
3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3658 $pl->save; 3784 $pl->save;
3659 } 3785 }
3660 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3661 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3662 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3663 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3664 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3665 $map->valid or next; 3793 $map->valid or next;
3666 $map->save; 3794 $map->save;
3667 } 3795 }
3668 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3669 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3670 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3671 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3672 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3673 3803
3674 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3675 write_uuid_sync 1; 3805 write_uuid_sync 1;
3676 warn "emergency_perl_save: end write uuid\n"; 3806 info "emergency_perl_save: end write uuid\n";
3807
3808 cf::write_runtime_sync; # external watchdog should not bark
3809
3810 trace "emergency_perl_save: syncing database to disk";
3811 BDB::db_env_txn_checkpoint $DB_ENV;
3812
3813 info "emergency_perl_save: starting sync\n";
3814 IO::AIO::aio_sync sub {
3815 info "emergency_perl_save: finished sync\n";
3816 };
3817
3818 cf::write_runtime_sync; # external watchdog should not bark
3819
3820 trace "emergency_perl_save: flushing outstanding aio requests";
3821 while (IO::AIO::nreqs || BDB::nreqs) {
3822 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3823 }
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3677 }; 3826 };
3678 3827
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3684 warn "emergency_perl_save: leave\n"; 3828 info "emergency_perl_save: leave\n";
3685} 3829}
3686 3830
3687sub post_cleanup { 3831sub post_cleanup {
3688 my ($make_core) = @_; 3832 my ($make_core) = @_;
3689 3833
3834 IO::AIO::flush;
3835
3690 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3691 if $make_core; 3837 if $make_core;
3692 3838
3693 my $fh = pidfile; 3839 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3695} 3841}
… …
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) { 3862 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"}; 3863 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 } 3865 }
3720 warn "cleared package $pkg\n";#d#
3721} 3866}
3722 3867
3723sub do_reload_perl() { 3868sub do_reload_perl() {
3724 # can/must only be called in main 3869 # can/must only be called in main
3725 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3726 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3727 return; 3872 return;
3728 } 3873 }
3729 3874
3730 return if $RELOAD++; 3875 return if $RELOAD++;
3731 3876
3732 my $t1 = EV::time; 3877 my $t1 = AE::time;
3733 3878
3734 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3735 warn "reloading..."; 3881 info "reloading...";
3736 3882
3737 warn "entering sync_job"; 3883 trace "entering sync_job";
3738 3884
3739 cf::sync_job { 3885 cf::sync_job {
3740 cf::write_runtime_sync; # external watchdog should not bark
3741 cf::emergency_save; 3886 #cf::emergency_save;
3742 cf::write_runtime_sync; # external watchdog should not bark
3743 3887
3744 warn "syncing database to disk";
3745 BDB::db_env_txn_checkpoint $DB_ENV;
3746
3747 # if anything goes wrong in here, we should simply crash as we already saved
3748
3749 warn "flushing outstanding aio requests";
3750 while (IO::AIO::nreqs || BDB::nreqs) {
3751 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3752 }
3753
3754 warn "cancelling all extension coros"; 3888 trace "cancelling all extension coros";
3755 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3756 %EXT_CORO = (); 3890 %EXT_CORO = ();
3757 3891
3758 warn "removing commands"; 3892 trace "removing commands";
3759 %COMMAND = (); 3893 %COMMAND = ();
3760 3894
3761 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3762 %EXTCMD = (); 3896 %EXTCMD = ();
3763 %EXTICMD = (); 3897 %EXTICMD = ();
3764 3898
3765 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3766 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3767 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3768 3902
3769 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3770 eval { 3904 eval {
3771 $cb->($pkg); 3905 $cb->($pkg);
3772 1 3906 1
3773 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3774 } 3908 }
3775 3909
3776 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3777 clear_package $pkg; 3911 clear_package $pkg;
3778 } 3912 }
3779 3913
3780 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783 3917
3784 warn "... unloading $k"; 3918 trace "... unloading $k";
3785 delete $INC{$k}; 3919 delete $INC{$k};
3786 3920
3787 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3789 3923
… …
3792 } 3926 }
3793 3927
3794 clear_package $k; 3928 clear_package $k;
3795 } 3929 }
3796 3930
3797 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3798 clear_package "safe::$_" 3932 clear_package "safe::$_"
3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3933 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3800 3934
3801 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3802 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3804 3938
3805 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3806 # and global variables created in xs 3940 # and global variables created in xs
3807 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3808 3942
3809 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3810 3944
3811 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3812 require cf; 3946 require cf;
3813 cf::_connect_to_perl_1; 3947 cf::_connect_to_perl_1;
3814 3948
3815 warn "loading config and database again"; 3949 trace "loading config and database again";
3816 cf::reload_config; 3950 cf::reload_config;
3817 3951
3818 warn "loading extensions"; 3952 trace "loading extensions";
3819 cf::load_extensions; 3953 cf::load_extensions;
3820 3954
3821 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3822 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3823 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3824 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3825 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3826 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3827 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3828 } 3962 }
3829 3963
3830 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3831 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3832 3966
3833 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3834 3968
3835 1 3969 1
3836 } or do { 3970 } or do {
3837 warn $@; 3971 error $@;
3838 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3839 }; 3973 };
3840 3974
3841 warn "reloaded"; 3975 info "reloaded";
3842 --$RELOAD; 3976 --$RELOAD;
3843 } 3977 }
3844 3978
3845 $t1 = EV::time - $t1; 3979 $t1 = AE::time - $t1;
3846 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3847}; 3981};
3848 3982
3849our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3850 3984
3851sub reload_perl() { 3985sub reload_perl() {
… …
3853 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3854 3988
3855 $RELOAD_WATCHER ||= cf::async { 3989 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions; 3990 Coro::AIO::aio_wait cache_extensions;
3857 3991
3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3859 do_reload_perl; 3993 do_reload_perl;
3860 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3861 }; 3995 };
3862 }; 3996 };
3863} 3997}
… …
3872 reload_perl; 4006 reload_perl;
3873 }; 4007 };
3874 } 4008 }
3875}; 4009};
3876 4010
3877unshift @INC, $LIBDIR; 4011#############################################################################
3878 4012
3879my $bug_warning = 0; 4013my $bug_warning = 0;
3880 4014
3881our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3882our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3883 4017
3884sub wait_for_tick { 4018sub wait_for_tick() {
3885 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3886 4020
3887 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3888 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3889 $signal->wait; 4023 $signal->wait;
3890} 4024}
3891 4025
3892sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3894 4028
3895 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3896 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3897 $signal->wait; 4031 $signal->wait;
… …
3904 return; 4038 return;
3905 } 4039 }
3906 4040
3907 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3908 4042
4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4044
3909 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4046 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3911 Coro::async_pool { 4047 Coro::async_pool {
3912 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3913 write_runtime_sync 4049 write_runtime_sync
3914 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3915 }; 4051 };
3916 } 4052 }
3917 4053
3918 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3919 $sig->send; 4055 $sig->send;
… …
3927 4063
3928 if (0) { 4064 if (0) {
3929 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
3930 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
3931 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3932 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
3933 } 4069 }
3934 } 4070 }
3935} 4071}
3936 4072
3937{ 4073{
3938 # configure BDB 4074 # configure BDB
3939 4075
3940 BDB::min_parallel 8; 4076 BDB::min_parallel 16;
3941 BDB::max_poll_reqs $TICK * 0.1; 4077 BDB::max_poll_reqs $TICK * 0.1;
3942 $AnyEvent::BDB::WATCHER->priority (1); 4078 $AnyEvent::BDB::WATCHER->priority (1);
3943 4079
3944 unless ($DB_ENV) { 4080 unless ($DB_ENV) {
3945 $DB_ENV = BDB::db_env_create; 4081 $DB_ENV = BDB::db_env_create;

Diff Legend

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