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.546 by root, Thu May 6 22:57:49 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 {
… …
584 reset_signals; 605 reset_signals;
585 &$cb 606 &$cb
586 }, @args; 607 }, @args;
587 608
588 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 )
589} 621}
590 622
591=item $coin = coin_from_name $name 623=item $coin = coin_from_name $name
592 624
593=cut 625=cut
… …
630within each server. 662within each server.
631 663
632=cut 664=cut
633 665
634sub db_table($) { 666sub db_table($) {
667 cf::error "db_get called from main context"
668 if $Coro::current == $Coro::main;
669
635 my ($name) = @_; 670 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 671 my $db = BDB::db_create $DB_ENV;
637 672
638 eval { 673 eval {
639 $db->set_flags (BDB::CHKSUM); 674 $db->set_flags (BDB::CHKSUM);
… …
649} 684}
650 685
651our $DB; 686our $DB;
652 687
653sub db_init { 688sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 689 $DB ||= db_table "db";
656 };
657} 690}
658 691
659sub db_get($$) { 692sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 693 my $key = "$_[0]/$_[1]";
661 694
662 cf::sync_job { 695 cf::error "db_get called from main context"
696 if $Coro::current == $Coro::main;
697
663 BDB::db_get $DB, undef, $key, my $data; 698 BDB::db_get $DB, undef, $key, my $data;
664 699
665 $! ? () 700 $! ? ()
666 : $data 701 : $data
667 }
668} 702}
669 703
670sub db_put($$$) { 704sub db_put($$$) {
671 BDB::dbreq_pri 4; 705 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 706 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
728 762
729 my $t1 = Time::HiRes::time; 763 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 764 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 765 my $t2 = Time::HiRes::time;
732 766
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 767 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 768
735 db_put cache => "$id/data", $data; 769 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 770 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 771 db_put cache => "$id/meta", $meta;
738 772
… …
748 782
749=cut 783=cut
750 784
751sub datalog($@) { 785sub datalog($@) {
752 my ($type, %kv) = @_; 786 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 787 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 788}
755 789
756=back 790=back
757 791
758=cut 792=cut
… …
953 987
954 } elsif (exists $cb_id{$type}) { 988 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 989 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 990
957 } elsif (ref $type) { 991 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 992 error "attaching objects not supported, ignoring.\n";
959 993
960 } else { 994 } else {
961 shift @arg; 995 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 996 error "attach argument '$type' not supported, ignoring.\n";
963 } 997 }
964 } 998 }
965} 999}
966 1000
967sub _object_attach { 1001sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1011 _attach $registry, $klass, @attach;
978 } 1012 }
979 1013
980 $obj->{$name} = \%arg; 1014 $obj->{$name} = \%arg;
981 } else { 1015 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1016 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1017 }
984 1018
985 $obj->{_attachment}{$name} = undef; 1019 $obj->{_attachment}{$name} = undef;
986} 1020}
987 1021
… …
1046 1080
1047 for (@$callbacks) { 1081 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1082 eval { &{$_->[1]} };
1049 1083
1050 if ($@) { 1084 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1085 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1086 override;
1054 } 1087 }
1055 1088
1056 return 1 if $override; 1089 return 1 if $override;
1057 } 1090 }
… …
1136 for (@$attach) { 1169 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1170 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1171 _attach $registry, $klass, @attach;
1139 } 1172 }
1140 } else { 1173 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1174 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1175 }
1143 } 1176 }
1144} 1177}
1145 1178
1146cf::attachable->attach ( 1179cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1206 my ($filename, $rdata, $objs) = @_;
1174 1207
1175 sync_job { 1208 sync_job {
1176 if (length $$rdata) { 1209 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1211 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1212 $decname, length $$rdata, scalar @$objs
1213 if $VERBOSE_IO;
1180 1214
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1215 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1216 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1217 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1218 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1240 aio_rename "$filename~", $filename;
1207 1241
1208 $filename =~ s%/[^/]+$%%; 1242 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1243 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1244 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1245 error "unable to save objects: $filename~: $!\n";
1212 } 1246 }
1213 } else { 1247 } else {
1214 aio_unlink $filename; 1248 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1249 aio_unlink "$filename.pst";
1216 } 1250 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1274 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1275 $av = $st->{objs};
1242 } 1276 }
1243 1277
1244 utf8::decode (my $decname = $filename); 1278 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1279 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1280 $decname, length $data, scalar @{$av || []}
1281 if $VERBOSE_IO;
1247 1282
1248 ($data, $av) 1283 ($data, $av)
1249} 1284}
1250 1285
1251=head2 COMMAND CALLBACKS 1286=head2 COMMAND CALLBACKS
… …
1310} 1345}
1311 1346
1312use File::Glob (); 1347use File::Glob ();
1313 1348
1314cf::player->attach ( 1349cf::player->attach (
1315 on_command => sub { 1350 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1351 my ($pl, $name, $params) = @_;
1317 1352
1318 my $cb = $COMMAND{$name} 1353 my $cb = $COMMAND{$name}
1319 or return; 1354 or return;
1320 1355
… …
1343 1378
1344 $pl->ext_reply ($reply, @reply) 1379 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1380 if $reply;
1346 1381
1347 } else { 1382 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1383 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1384 }
1350 1385
1351 cf::override; 1386 cf::override;
1352 }, 1387 },
1353); 1388);
… …
1364 1399
1365 $grp 1400 $grp
1366} 1401}
1367 1402
1368sub load_extensions { 1403sub load_extensions {
1404 info "loading extensions...";
1405
1369 cf::sync_job { 1406 cf::sync_job {
1370 my %todo; 1407 my %todo;
1371 1408
1372 for my $path (<$LIBDIR/*.ext>) { 1409 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1410 next unless -r $path;
… …
1391 1428
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1429 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1430 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1431
1395 $ext{source} = 1432 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1433 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1434 . "#line 1 \"$path\"\n{\n"
1398 . $source 1435 . $source
1399 . "\n};\n1"; 1436 . "\n};\n1";
1400 1437
1401 $todo{$base} = \%ext; 1438 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1450 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1451 next ext
1415 unless exists $done{$_}; 1452 unless exists $done{$_};
1416 } 1453 }
1417 1454
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1455 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1456
1420 my $active = eval $v->{source}; 1457 my $active = eval $v->{source};
1421 1458
1422 if (length $@) { 1459 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1460 error "$v->{path}: $@\n";
1424 1461
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1462 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1463 if exists $v->{meta}{mandatory};
1464
1465 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1466 delete $todo{$k};
1427 } else { 1467 } else {
1428 $done{$k} = delete $todo{$k}; 1468 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1469 push @EXTS, $v->{pkg};
1430 $progress = 1; 1470 $progress = 1;
1431 1471
1432 warn "$v->{base}: extension inactive.\n" 1472 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1473 unless $active;
1434 } 1474 }
1435 } 1475 }
1436 1476
1437 unless ($progress) { 1477 unless ($progress) {
… …
1533 $cf::PLAYER{$login} = $pl 1573 $cf::PLAYER{$login} = $pl
1534 } 1574 }
1535 } 1575 }
1536} 1576}
1537 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
1538sub save($) { 1591sub save($) {
1539 my ($pl) = @_; 1592 my ($pl) = @_;
1540 1593
1541 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1542 1595
… …
1547 1600
1548 aio_mkdir playerdir $pl, 0770; 1601 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1602 $pl->{last_save} = $cf::RUNTIME;
1550 1603
1551 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];
1552 1608
1553 $pl->save_pl ($path); 1609 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1610 cf::cede_to_tick;
1555} 1611}
1556 1612
… …
1593 $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
1594 1650
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1651 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1596 $pl->deactivate; 1652 $pl->deactivate;
1597 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;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1654 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1600 $pl->ns->destroy if $pl->ns; 1655 $pl->ns->destroy if $pl->ns;
1601 1656
1602 my $path = playerdir $pl; 1657 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1658 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1658 \@logins 1713 \@logins
1659} 1714}
1660 1715
1661=item $player->maps 1716=item $player->maps
1662 1717
1718=item cf::player::maps $login
1719
1663Returns an arrayref of map paths that are private for this 1720Returns an arrayref of map paths that are private for this
1664player. May block. 1721player. May block.
1665 1722
1666=cut 1723=cut
1667 1724
… …
1729=cut 1786=cut
1730 1787
1731sub find_by_path($) { 1788sub find_by_path($) {
1732 my ($path) = @_; 1789 my ($path) = @_;
1733 1790
1791 $path =~ s/^~[^\/]*//; # skip ~login
1792
1734 my ($match, $specificity); 1793 my ($match, $specificity);
1735 1794
1736 for my $region (list) { 1795 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1796 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity) 1797 ($match, $specificity) = ($region, $region->specificity)
… …
1769 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
1770 1829
1771 # mit "rum" bekleckern, nicht 1830 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1831 $self->_create_random_map (
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1832 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1833 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1834 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map}, 1835 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize}, 1836 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1837 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1838 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1794 1853
1795sub register { 1854sub register {
1796 my (undef, $regex, $prio) = @_; 1855 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 1856 my $pkg = caller;
1798 1857
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 1858 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 1859
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1860 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1861}
1804 1862
1805# also paths starting with '/' 1863# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1864$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1865
1808sub thawer_merge { 1866sub thawer_merge {
1809 my ($self, $merge) = @_; 1867 my ($self, $merge) = @_;
1810 1868
1811 # we have to keep some variables in memory intact 1869 # we have to keep some variables in memory intact
… …
1816} 1874}
1817 1875
1818sub normalise { 1876sub normalise {
1819 my ($path, $base) = @_; 1877 my ($path, $base) = @_;
1820 1878
1821 $path = "$path"; # make sure its a string 1879 $path = "$path"; # make sure it's a string
1822 1880
1823 $path =~ s/\.map$//; 1881 $path =~ s/\.map$//;
1824 1882
1825 # map plan: 1883 # map plan:
1826 # 1884 #
… …
1865 $self->init; # pass $1 etc. 1923 $self->init; # pass $1 etc.
1866 return $self; 1924 return $self;
1867 } 1925 }
1868 } 1926 }
1869 1927
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1928 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 1929 ()
1872} 1930}
1873 1931
1874sub init { 1932sub init {
1875 my ($self) = @_; 1933 my ($self) = @_;
… …
1997} 2055}
1998 2056
1999sub find; 2057sub find;
2000sub find { 2058sub find {
2001 my ($path, $origin) = @_; 2059 my ($path, $origin) = @_;
2060
2061 cf::cede_to_tick;
2002 2062
2003 $path = normalise $path, $origin && $origin->path; 2063 $path = normalise $path, $origin && $origin->path;
2004 2064
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2065 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2066 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2093 } 2153 }
2094 2154
2095 $self->post_load; 2155 $self->post_load;
2096} 2156}
2097 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
2098sub customise_for { 2161sub customise_for {
2099 my ($self, $ob) = @_; 2162 my ($self, $ob) = @_;
2100 2163
2101 return find "~" . $ob->name . "/" . $self->{path} 2164 return find "~" . $ob->name . "/" . $self->{path}
2102 if $self->per_player; 2165 if $self->per_player;
… …
2118 or next; 2181 or next;
2119 $neigh = find $neigh, $map 2182 $neigh = find $neigh, $map
2120 or next; 2183 or next;
2121 $neigh->load; 2184 $neigh->load;
2122 2185
2186 # now find the diagonal neighbours
2123 push @neigh, 2187 push @neigh,
2124 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2188 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2125 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2189 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2126 } 2190 }
2127 2191
… …
2134} 2198}
2135 2199
2136sub find_sync { 2200sub find_sync {
2137 my ($path, $origin) = @_; 2201 my ($path, $origin) = @_;
2138 2202
2139 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
2140} 2207}
2141 2208
2142sub do_load_sync { 2209sub do_load_sync {
2143 my ($map) = @_; 2210 my ($map) = @_;
2144 2211
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2212 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main; 2213 if $Coro::current == $Coro::main;
2147 2214
2148 cf::sync_job { $map->load }; 2215 $map->load;
2149} 2216}
2150 2217
2151our %MAP_PREFETCH; 2218our %MAP_PREFETCH;
2152our $MAP_PREFETCHER = undef; 2219our $MAP_PREFETCHER = undef;
2153 2220
… …
2179 $MAP_PREFETCHER->prio (6); 2246 $MAP_PREFETCHER->prio (6);
2180 2247
2181 () 2248 ()
2182} 2249}
2183 2250
2251# common code, used by both ->save and ->swapout
2184sub save { 2252sub _save {
2185 my ($self) = @_; 2253 my ($self) = @_;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2254
2189 $self->{last_save} = $cf::RUNTIME; 2255 $self->{last_save} = $cf::RUNTIME;
2190 2256
2191 return unless $self->dirty; 2257 return unless $self->dirty;
2192 2258
… …
2212 } else { 2278 } else {
2213 $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);
2214 } 2280 }
2215} 2281}
2216 2282
2283sub save {
2284 my ($self) = @_;
2285
2286 my $lock = cf::lock_acquire "map_data:$self->{path}";
2287
2288 $self->_save;
2289}
2290
2217sub swap_out { 2291sub swap_out {
2218 my ($self) = @_; 2292 my ($self) = @_;
2219 2293
2220 # save first because save cedes
2221 $self->save;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2294 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2295
2225 return if $self->players;
2226 return if $self->in_memory != cf::MAP_ACTIVE; 2296 return if $self->in_memory != cf::MAP_ACTIVE;
2227 return if $self->{deny_save}; 2297 return if $self->{deny_save};
2298 return if $self->players;
2228 2299
2300 # first deactivate the map and "unlink" it from the core
2301 $self->deactivate;
2302 $_->clear_links_to ($self) for values %cf::MAP;
2229 $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};
2230 2350
2231 $self->deactivate; 2351 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP; 2352 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear; 2353 $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 2354
2279 $self->unlink_save; 2355 $self->unlink_save;
2280 $self->destroy; 2356 $self->destroy;
2281} 2357}
2282 2358
… …
2290 2366
2291 delete $cf::MAP{$self->path}; 2367 delete $cf::MAP{$self->path};
2292 2368
2293 $self->unlink_save; 2369 $self->unlink_save;
2294 2370
2295 bless $self, "cf::map"; 2371 bless $self, "cf::map::wrap";
2296 delete $self->{deny_reset}; 2372 delete $self->{deny_reset};
2297 $self->{deny_save} = 1; 2373 $self->{deny_save} = 1;
2298 $self->reset_timeout (1); 2374 $self->reset_timeout (1);
2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2375 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2300 2376
… …
2530 2606
2531Freezes 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}>).
2532 2608
2533The 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.
2534for 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,
2535though, 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
2536map. 2612map.
2537 2613
2538Will never block. 2614Will never block.
2539 2615
2540=item $player_object->leave_link ($map, $x, $y) 2616=item $player_object->leave_link ($map, $x, $y)
… …
2561sub cf::object::player::enter_link { 2637sub cf::object::player::enter_link {
2562 my ($self) = @_; 2638 my ($self) = @_;
2563 2639
2564 $self->deactivate_recursive; 2640 $self->deactivate_recursive;
2565 2641
2642 ++$self->{_link_recursion};
2643
2566 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2644 return if UNIVERSAL::isa $self->map, "ext::map_link";
2567 2645
2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2646 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569 if $self->map && $self->map->{path} ne "{link}"; 2647 if $self->map && $self->map->{path} ne "{link}";
2570 2648
2571 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2649 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2572} 2650}
2573 2651
2574sub cf::object::player::leave_link { 2652sub cf::object::player::leave_link {
2575 my ($self, $map, $x, $y) = @_; 2653 my ($self, $map, $x, $y) = @_;
2576 2654
… …
2601 $map->load_neighbours; 2679 $map->load_neighbours;
2602 2680
2603 return unless $self->contr->active; 2681 return unless $self->contr->active;
2604 2682
2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2683 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606 $self->enter_map ($map, $x, $y); 2684 if ($self->enter_map ($map, $x, $y)) {
2607 2685 # entering was successful
2686 delete $self->{_link_recursion};
2608 # only activate afterwards, to support waiting in hooks 2687 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive; 2688 $self->activate_recursive;
2610} 2689 }
2611 2690
2691}
2692
2612=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)]])
2613 2694
2614Moves 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
2615her, loading and preparing them map, calling the provided $check callback 2696her, loading and preparing them map, calling the provided $check callback
2616that 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
2617the 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
… …
2624 2705
2625our $GOTOGEN; 2706our $GOTOGEN;
2626 2707
2627sub cf::object::player::goto { 2708sub cf::object::player::goto {
2628 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 }
2629 2716
2630 # 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
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2718 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2719
2633 $self->enter_link; 2720 $self->enter_link;
… …
2657 my $map = eval { 2744 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2745 my $map = defined $path ? cf::map::find $path : undef;
2659 2746
2660 if ($map) { 2747 if ($map) {
2661 $map = $map->customise_for ($self); 2748 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2749 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2750 } else {
2664 $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);
2665 } 2752 }
2666 2753
2667 $map 2754 $map
… …
2675 if ($gen == $self->{_goto_generation}) { 2762 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2763 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2764 $self->leave_link ($map, $x, $y);
2678 } 2765 }
2679 2766
2680 $done->() if $done; 2767 $done->($self) if $done;
2681 })->prio (1); 2768 })->prio (1);
2682} 2769}
2683 2770
2684=item $player_object->enter_exit ($exit_object) 2771=item $player_object->enter_exit ($exit_object)
2685 2772
… …
2778 $self->message ("Something went wrong deep within the deliantra server. " 2865 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "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. "
2780 . "Please report this to the dungeon master!", 2867 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2868 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2869
2783 warn "ERROR in enter_exit: $@"; 2870 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 2871 $self->leave_link;
2785 } 2872 }
2786 })->prio (1); 2873 })->prio (1);
2787} 2874}
2788 2875
… …
3101 3188
3102 $ns->ext_reply ($reply, @reply) 3189 $ns->ext_reply ($reply, @reply)
3103 if $reply; 3190 if $reply;
3104 3191
3105 } else { 3192 } else {
3106 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";
3107 } 3194 }
3108 3195
3109 cf::override; 3196 cf::override;
3110 }, 3197 },
3111); 3198);
… …
3131 3218
3132 $coro 3219 $coro
3133} 3220}
3134 3221
3135cf::client->attach ( 3222cf::client->attach (
3136 on_destroy => sub { 3223 on_client_destroy => sub {
3137 my ($ns) = @_; 3224 my ($ns) = @_;
3138 3225
3139 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3226 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3140 }, 3227 },
3141); 3228);
… …
3192 decrease split destroy change_exp value msg lore send_msg)], 3279 decrease split destroy change_exp value msg lore send_msg)],
3193 ["cf::object::player" => qw(player)], 3280 ["cf::object::player" => qw(player)],
3194 ["cf::player" => qw(peaceful send_msg)], 3281 ["cf::player" => qw(peaceful send_msg)],
3195 ["cf::map" => qw(trigger)], 3282 ["cf::map" => qw(trigger)],
3196) { 3283) {
3197 no strict 'refs';
3198 my ($pkg, @funs) = @$_; 3284 my ($pkg, @funs) = @$_;
3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3285 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3200 for @funs; 3286 for @funs;
3201} 3287}
3202 3288
… …
3241 local @cf::_safe_eval_args = values %vars; 3327 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval; 3328 @res = wantarray ? eval eval : scalar eval $eval;
3243 } 3329 }
3244 3330
3245 if ($@) { 3331 if ($@) {
3246 warn "$@"; 3332 warn "$@",
3247 warn "while executing safe code '$code'\n"; 3333 "while executing safe code '$code'\n",
3248 warn "with arguments " . (join " ", %vars) . "\n"; 3334 "with arguments " . (join " ", %vars) . "\n";
3249 } 3335 }
3250 3336
3251 wantarray ? @res : $res[0] 3337 wantarray ? @res : $res[0]
3252} 3338}
3253 3339
… …
3287 # for this (global event?) 3373 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = (); 3374 %ext::player_env::MUSIC_FACE_CACHE = ();
3289 3375
3290 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3376 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3291 3377
3292 warn "loading facedata from $path\n"; 3378 trace "loading facedata from $path\n";
3293 3379
3294 my $facedata;
3295 0 < aio_load $path, $facedata 3380 0 < aio_load $path, my $facedata
3296 or die "$path: $!"; 3381 or die "$path: $!";
3297 3382
3298 $facedata = Coro::Storable::thaw $facedata; 3383 $facedata = Coro::Storable::thaw $facedata;
3299 3384
3300 $facedata->{version} == 2 3385 $facedata->{version} == 2
… …
3331 3416
3332 if (my $smooth = cf::face::find $info->{smooth}) { 3417 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth; 3418 cf::face::set_smooth $idx, $smooth;
3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3419 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335 } else { 3420 } else {
3336 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3421 error "smooth face '$info->{smooth}' not found for face '$face'";
3337 } 3422 }
3338 3423
3339 cf::cede_to_tick; 3424 cf::cede_to_tick;
3340 } 3425 }
3341 } 3426 }
… …
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3444 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360 3445
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3446 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 cf::face::set_type $idx, $info->{type}; 3447 cf::face::set_type $idx, $info->{type};
3363 } else { 3448 } else {
3364 $RESOURCE{$name} = $info; 3449 $RESOURCE{$name} = $info; # unused
3365 } 3450 }
3366 3451
3367 cf::cede_to_tick; 3452 cf::cede_to_tick;
3368 } 3453 }
3369 } 3454 }
3370 3455
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3456 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372 3457
3373 1 3458 1
3374} 3459}
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 3460
3396register_exticmd fx_want => sub { 3461register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_; 3462 my ($ns, $want) = @_;
3398 3463
3399 while (my ($k, $v) = each %$want) { 3464 while (my ($k, $v) = each %$want) {
… …
3438sub reload_treasures { 3503sub reload_treasures {
3439 load_resource_file "$DATADIR/treasures" 3504 load_resource_file "$DATADIR/treasures"
3440 or die "unable to load treasurelists\n"; 3505 or die "unable to load treasurelists\n";
3441} 3506}
3442 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
3443sub reload_resources { 3531sub reload_resources {
3444 warn "reloading resource files...\n"; 3532 trace "reloading resource files...\n";
3445 3533
3534 reload_exp_table;
3535 reload_materials;
3446 reload_facedata; 3536 reload_facedata;
3537 reload_sound;
3447 reload_archetypes; 3538 reload_archetypes;
3448 reload_regions; 3539 reload_regions;
3449 reload_treasures; 3540 reload_treasures;
3450 3541
3451 warn "finished reloading resource files\n"; 3542 trace "finished reloading resource files\n";
3452} 3543}
3453 3544
3454sub reload_config { 3545sub reload_config {
3455 warn "reloading config file...\n"; 3546 trace "reloading config file...\n";
3456 3547
3457 open my $fh, "<:utf8", "$CONFDIR/config" 3548 0 < aio_load "$CONFDIR/config", my $config
3458 or return; 3549 or die "$CONFDIR/config: $!";
3459 3550
3460 local $/; 3551 utf8::decode $config;
3552
3553 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3461 *CFG = YAML::XS::Load scalar <$fh>; 3554 *CFG = YAML::XS::Load $config;
3462 3555
3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3556 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3464 3557
3465 $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};
3466 $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};
3467 3560
3468 if (exists $CFG{mlockall}) { 3561 if (exists $CFG{mlockall}) {
… …
3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3563 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3471 and die "WARNING: m(un)lockall failed: $!\n"; 3564 and die "WARNING: m(un)lockall failed: $!\n";
3472 }; 3565 };
3473 warn $@ if $@; 3566 warn $@ if $@;
3474 } 3567 }
3475
3476 warn "finished reloading resource files\n";
3477} 3568}
3478 3569
3479sub pidfile() { 3570sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3571 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!"; 3572 or die "$PIDFILE: $!";
… …
3494 seek $fh, 0, 0; 3585 seek $fh, 0, 0;
3495 print $fh $$; 3586 print $fh $$;
3496} 3587}
3497 3588
3498sub main_loop { 3589sub main_loop {
3499 warn "EV::loop starting\n"; 3590 trace "EV::loop starting\n";
3500 if (1) { 3591 if (1) {
3501 EV::loop; 3592 EV::loop;
3502 } 3593 }
3503 warn "EV::loop returned\n"; 3594 trace "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP; 3595 goto &main_loop unless $REALLY_UNLOOP;
3505} 3596}
3506 3597
3507sub main { 3598sub main {
3508 cf::init_globals; # initialise logging 3599 cf::init_globals; # initialise logging
3509 3600
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3601 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 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.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3603 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3604 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 3605
3520 $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
3521 3607
3522 # we must not ever block the main coroutine 3608 # we must not ever block the main coroutine
3523 local $Coro::idle = sub { 3609 local $Coro::idle = sub {
… …
3529 }; 3615 };
3530 3616
3531 evthread_start IO::AIO::poll_fileno; 3617 evthread_start IO::AIO::poll_fileno;
3532 3618
3533 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
3534 cf::load_settings; 3626 cf::load_settings;
3535 cf::load_materials;
3536 3627
3537 reload_resources; 3628 reload_resources;
3538 reload_config; 3629 reload_config;
3539 db_init; 3630 db_init;
3540 3631
3541 cf::init_uuid; 3632 cf::init_uuid;
3542 cf::init_signals; 3633 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills; 3634 cf::init_skills;
3545 3635
3546 cf::init_beforeplay; 3636 cf::init_beforeplay;
3547 3637
3548 atomic; 3638 atomic;
… …
3556 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};
3557 3647
3558 (pop @POST_INIT)->(0) while @POST_INIT; 3648 (pop @POST_INIT)->(0) while @POST_INIT;
3559 }; 3649 };
3560 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
3561 main_loop; 3659 goto &main_loop;
3562} 3660}
3563 3661
3564############################################################################# 3662#############################################################################
3565# initialisation and cleanup 3663# initialisation and cleanup
3566 3664
3567# install some emergency cleanup handlers 3665# install some emergency cleanup handlers
3568BEGIN { 3666BEGIN {
3569 our %SIGWATCHER = (); 3667 our %SIGWATCHER = ();
3570 for my $signal (qw(INT HUP TERM)) { 3668 for my $signal (qw(INT HUP TERM)) {
3571 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3669 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3572 cf::cleanup "SIG$signal"; 3670 cf::cleanup "SIG$signal";
3573 }; 3671 };
3574 } 3672 }
3575} 3673}
3576 3674
3577sub write_runtime_sync { 3675sub write_runtime_sync {
3578 my $t0 = EV::time; 3676 my $t0 = AE::time;
3579 3677
3580 # first touch the runtime file to show we are still running: 3678 # first touch the runtime file to show we are still running:
3581 # the fsync below can take a very very long time. 3679 # the fsync below can take a very very long time.
3582 3680
3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3681 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3605 or return; 3703 or return;
3606 3704
3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3705 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3608 and return; 3706 and return;
3609 3707
3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3708 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3611 3709
3612 1 3710 1
3613} 3711}
3614 3712
3615our $uuid_lock; 3713our $uuid_lock;
… …
3627 or return; 3725 or return;
3628 3726
3629 my $value = uuid_seq uuid_cur; 3727 my $value = uuid_seq uuid_cur;
3630 3728
3631 unless ($value) { 3729 unless ($value) {
3632 warn "cowardly refusing to write zero uuid value!\n"; 3730 info "cowardly refusing to write zero uuid value!\n";
3633 return; 3731 return;
3634 } 3732 }
3635 3733
3636 my $value = uuid_str $value + $uuid_skip; 3734 my $value = uuid_str $value + $uuid_skip;
3637 $uuid_skip = 0; 3735 $uuid_skip = 0;
… …
3647 or return; 3745 or return;
3648 3746
3649 aio_rename "$uuid~", $uuid 3747 aio_rename "$uuid~", $uuid
3650 and return; 3748 and return;
3651 3749
3652 warn "uuid file written ($value).\n"; 3750 trace "uuid file written ($value).\n";
3653 3751
3654 1 3752 1
3655 3753
3656} 3754}
3657 3755
… …
3663} 3761}
3664 3762
3665sub emergency_save() { 3763sub emergency_save() {
3666 my $freeze_guard = cf::freeze_mainloop; 3764 my $freeze_guard = cf::freeze_mainloop;
3667 3765
3668 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;
3669 3772
3670 cf::sync_job { 3773 cf::sync_job {
3671 # this is a trade-off: we want to be very quick here, so 3774 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 3775
3676 # use a peculiar iteration method to avoid tripping on perl 3776 # use a peculiar iteration method to avoid tripping on perl
3677 # refcount bugs in for. also avoids problems with players 3777 # refcount bugs in for. also avoids problems with players
3678 # and maps saved/destroyed asynchronously. 3778 # and maps saved/destroyed asynchronously.
3679 warn "emergency_perl_save: begin player save\n"; 3779 info "emergency_perl_save: begin player save\n";
3680 for my $login (keys %cf::PLAYER) { 3780 for my $login (keys %cf::PLAYER) {
3681 my $pl = $cf::PLAYER{$login} or next; 3781 my $pl = $cf::PLAYER{$login} or next;
3682 $pl->valid or next; 3782 $pl->valid or next;
3683 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3783 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3684 $pl->save; 3784 $pl->save;
3685 } 3785 }
3686 warn "emergency_perl_save: end player save\n"; 3786 info "emergency_perl_save: end player save\n";
3687 3787
3788 cf::write_runtime_sync; # external watchdog should not bark
3789
3688 warn "emergency_perl_save: begin map save\n"; 3790 info "emergency_perl_save: begin map save\n";
3689 for my $path (keys %cf::MAP) { 3791 for my $path (keys %cf::MAP) {
3690 my $map = $cf::MAP{$path} or next; 3792 my $map = $cf::MAP{$path} or next;
3691 $map->valid or next; 3793 $map->valid or next;
3692 $map->save; 3794 $map->save;
3693 } 3795 }
3694 warn "emergency_perl_save: end map save\n"; 3796 info "emergency_perl_save: end map save\n";
3695 3797
3798 cf::write_runtime_sync; # external watchdog should not bark
3799
3696 warn "emergency_perl_save: begin database checkpoint\n"; 3800 info "emergency_perl_save: begin database checkpoint\n";
3697 BDB::db_env_txn_checkpoint $DB_ENV; 3801 BDB::db_env_txn_checkpoint $DB_ENV;
3698 warn "emergency_perl_save: end database checkpoint\n"; 3802 info "emergency_perl_save: end database checkpoint\n";
3699 3803
3700 warn "emergency_perl_save: begin write uuid\n"; 3804 info "emergency_perl_save: begin write uuid\n";
3701 write_uuid_sync 1; 3805 write_uuid_sync 1;
3702 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
3703 }; 3826 };
3704 3827
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"; 3828 info "emergency_perl_save: leave\n";
3711} 3829}
3712 3830
3713sub post_cleanup { 3831sub post_cleanup {
3714 my ($make_core) = @_; 3832 my ($make_core) = @_;
3715 3833
3834 IO::AIO::flush;
3835
3716 warn Carp::longmess "post_cleanup backtrace" 3836 error Carp::longmess "post_cleanup backtrace"
3717 if $make_core; 3837 if $make_core;
3718 3838
3719 my $fh = pidfile; 3839 my $fh = pidfile;
3720 unlink $PIDFILE if <$fh> == $$; 3840 unlink $PIDFILE if <$fh> == $$;
3721} 3841}
… …
3741 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3861 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3742 for my $name (keys %$leaf_symtab) { 3862 for my $name (keys %$leaf_symtab) {
3743 _gv_clear *{"$pkg$name"}; 3863 _gv_clear *{"$pkg$name"};
3744# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3864# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3745 } 3865 }
3746 warn "cleared package $pkg\n";#d#
3747} 3866}
3748 3867
3749sub do_reload_perl() { 3868sub do_reload_perl() {
3750 # can/must only be called in main 3869 # can/must only be called in main
3751 if ($Coro::current != $Coro::main) { 3870 unless (in_main) {
3752 warn "can only reload from main coroutine"; 3871 error "can only reload from main coroutine";
3753 return; 3872 return;
3754 } 3873 }
3755 3874
3756 return if $RELOAD++; 3875 return if $RELOAD++;
3757 3876
3758 my $t1 = EV::time; 3877 my $t1 = AE::time;
3759 3878
3760 while ($RELOAD) { 3879 while ($RELOAD) {
3880 cf::get_slot 0.1, -1, "reload_perl";
3761 warn "reloading..."; 3881 info "reloading...";
3762 3882
3763 warn "entering sync_job"; 3883 trace "entering sync_job";
3764 3884
3765 cf::sync_job { 3885 cf::sync_job {
3766 cf::write_runtime_sync; # external watchdog should not bark
3767 cf::emergency_save; 3886 #cf::emergency_save;
3768 cf::write_runtime_sync; # external watchdog should not bark
3769 3887
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"; 3888 trace "cancelling all extension coros";
3781 $_->cancel for values %EXT_CORO; 3889 $_->cancel for values %EXT_CORO;
3782 %EXT_CORO = (); 3890 %EXT_CORO = ();
3783 3891
3784 warn "removing commands"; 3892 trace "removing commands";
3785 %COMMAND = (); 3893 %COMMAND = ();
3786 3894
3787 warn "removing ext/exti commands"; 3895 trace "removing ext/exti commands";
3788 %EXTCMD = (); 3896 %EXTCMD = ();
3789 %EXTICMD = (); 3897 %EXTICMD = ();
3790 3898
3791 warn "unloading/nuking all extensions"; 3899 trace "unloading/nuking all extensions";
3792 for my $pkg (@EXTS) { 3900 for my $pkg (@EXTS) {
3793 warn "... unloading $pkg"; 3901 trace "... unloading $pkg";
3794 3902
3795 if (my $cb = $pkg->can ("unload")) { 3903 if (my $cb = $pkg->can ("unload")) {
3796 eval { 3904 eval {
3797 $cb->($pkg); 3905 $cb->($pkg);
3798 1 3906 1
3799 } or warn "$pkg unloaded, but with errors: $@"; 3907 } or error "$pkg unloaded, but with errors: $@";
3800 } 3908 }
3801 3909
3802 warn "... clearing $pkg"; 3910 trace "... clearing $pkg";
3803 clear_package $pkg; 3911 clear_package $pkg;
3804 } 3912 }
3805 3913
3806 warn "unloading all perl modules loaded from $LIBDIR"; 3914 trace "unloading all perl modules loaded from $LIBDIR";
3807 while (my ($k, $v) = each %INC) { 3915 while (my ($k, $v) = each %INC) {
3808 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3916 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3809 3917
3810 warn "... unloading $k"; 3918 trace "... unloading $k";
3811 delete $INC{$k}; 3919 delete $INC{$k};
3812 3920
3813 $k =~ s/\.pm$//; 3921 $k =~ s/\.pm$//;
3814 $k =~ s/\//::/g; 3922 $k =~ s/\//::/g;
3815 3923
… …
3818 } 3926 }
3819 3927
3820 clear_package $k; 3928 clear_package $k;
3821 } 3929 }
3822 3930
3823 warn "getting rid of safe::, as good as possible"; 3931 trace "getting rid of safe::, as good as possible";
3824 clear_package "safe::$_" 3932 clear_package "safe::$_"
3825 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);
3826 3934
3827 warn "unloading cf.pm \"a bit\""; 3935 trace "unloading cf.pm \"a bit\"";
3828 delete $INC{"cf.pm"}; 3936 delete $INC{"cf.pm"};
3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3937 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3830 3938
3831 # don't, removes xs symbols, too, 3939 # don't, removes xs symbols, too,
3832 # and global variables created in xs 3940 # and global variables created in xs
3833 #clear_package __PACKAGE__; 3941 #clear_package __PACKAGE__;
3834 3942
3835 warn "unload completed, starting to reload now"; 3943 info "unload completed, starting to reload now";
3836 3944
3837 warn "reloading cf.pm"; 3945 trace "reloading cf.pm";
3838 require cf; 3946 require cf;
3839 cf::_connect_to_perl_1; 3947 cf::_connect_to_perl_1;
3840 3948
3841 warn "loading config and database again"; 3949 trace "loading config and database again";
3842 cf::reload_config; 3950 cf::reload_config;
3843 3951
3844 warn "loading extensions"; 3952 trace "loading extensions";
3845 cf::load_extensions; 3953 cf::load_extensions;
3846 3954
3847 if ($REATTACH_ON_RELOAD) { 3955 if ($REATTACH_ON_RELOAD) {
3848 warn "reattaching attachments to objects/players"; 3956 trace "reattaching attachments to objects/players";
3849 _global_reattach; # objects, sockets 3957 _global_reattach; # objects, sockets
3850 warn "reattaching attachments to maps"; 3958 trace "reattaching attachments to maps";
3851 reattach $_ for values %MAP; 3959 reattach $_ for values %MAP;
3852 warn "reattaching attachments to players"; 3960 trace "reattaching attachments to players";
3853 reattach $_ for values %PLAYER; 3961 reattach $_ for values %PLAYER;
3854 } 3962 }
3855 3963
3856 warn "running post_init jobs"; 3964 trace "running post_init jobs";
3857 (pop @POST_INIT)->(1) while @POST_INIT; 3965 (pop @POST_INIT)->(1) while @POST_INIT;
3858 3966
3859 warn "leaving sync_job"; 3967 trace "leaving sync_job";
3860 3968
3861 1 3969 1
3862 } or do { 3970 } or do {
3863 warn $@; 3971 error $@;
3864 cf::cleanup "error while reloading, exiting."; 3972 cf::cleanup "error while reloading, exiting.";
3865 }; 3973 };
3866 3974
3867 warn "reloaded"; 3975 info "reloaded";
3868 --$RELOAD; 3976 --$RELOAD;
3869 } 3977 }
3870 3978
3871 $t1 = EV::time - $t1; 3979 $t1 = AE::time - $t1;
3872 warn "reload completed in ${t1}s\n"; 3980 info "reload completed in ${t1}s\n";
3873}; 3981};
3874 3982
3875our $RELOAD_WATCHER; # used only during reload 3983our $RELOAD_WATCHER; # used only during reload
3876 3984
3877sub reload_perl() { 3985sub reload_perl() {
… …
3879 # coro crashes during coro_state_free->destroy here. 3987 # coro crashes during coro_state_free->destroy here.
3880 3988
3881 $RELOAD_WATCHER ||= cf::async { 3989 $RELOAD_WATCHER ||= cf::async {
3882 Coro::AIO::aio_wait cache_extensions; 3990 Coro::AIO::aio_wait cache_extensions;
3883 3991
3884 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3992 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3885 do_reload_perl; 3993 do_reload_perl;
3886 undef $RELOAD_WATCHER; 3994 undef $RELOAD_WATCHER;
3887 }; 3995 };
3888 }; 3996 };
3889} 3997}
… …
3898 reload_perl; 4006 reload_perl;
3899 }; 4007 };
3900 } 4008 }
3901}; 4009};
3902 4010
3903unshift @INC, $LIBDIR; 4011#############################################################################
3904 4012
3905my $bug_warning = 0; 4013my $bug_warning = 0;
3906 4014
3907our @WAIT_FOR_TICK; 4015our @WAIT_FOR_TICK;
3908our @WAIT_FOR_TICK_BEGIN; 4016our @WAIT_FOR_TICK_BEGIN;
3909 4017
3910sub wait_for_tick { 4018sub wait_for_tick() {
3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4019 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3912 4020
3913 my $signal = new Coro::Signal; 4021 my $signal = new Coro::Signal;
3914 push @WAIT_FOR_TICK, $signal; 4022 push @WAIT_FOR_TICK, $signal;
3915 $signal->wait; 4023 $signal->wait;
3916} 4024}
3917 4025
3918sub wait_for_tick_begin { 4026sub wait_for_tick_begin() {
3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4027 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3920 4028
3921 my $signal = new Coro::Signal; 4029 my $signal = new Coro::Signal;
3922 push @WAIT_FOR_TICK_BEGIN, $signal; 4030 push @WAIT_FOR_TICK_BEGIN, $signal;
3923 $signal->wait; 4031 $signal->wait;
… …
3930 return; 4038 return;
3931 } 4039 }
3932 4040
3933 cf::server_tick; # one server iteration 4041 cf::server_tick; # one server iteration
3934 4042
3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4043 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3936 4044
3937 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4045 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3938 $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.;
3939 Coro::async_pool { 4047 Coro::async_pool {
3940 $Coro::current->{desc} = "runtime saver"; 4048 $Coro::current->{desc} = "runtime saver";
3941 write_runtime_sync 4049 write_runtime_sync
3942 or warn "ERROR: unable to write runtime file: $!"; 4050 or error "ERROR: unable to write runtime file: $!";
3943 }; 4051 };
3944 } 4052 }
3945 4053
3946 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3947 $sig->send; 4055 $sig->send;
… …
3955 4063
3956 if (0) { 4064 if (0) {
3957 if ($NEXT_TICK) { 4065 if ($NEXT_TICK) {
3958 my $jitter = $TICK_START - $NEXT_TICK; 4066 my $jitter = $TICK_START - $NEXT_TICK;
3959 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4067 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3960 warn "jitter $JITTER\n";#d# 4068 debug "jitter $JITTER\n";#d#
3961 } 4069 }
3962 } 4070 }
3963} 4071}
3964 4072
3965{ 4073{

Diff Legend

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