ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 93our $RUNTIME;
91 94
92our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
96# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 101
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
272Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
275returned. 277returned.
276 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
277Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
279 284
280=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
281 286
282Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
283 288
284=cut 289=cut
285 290
286our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
287 293
288sub lock_wait($) { 294sub lock_wait($) {
289 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
290 301
291 # wait for lock, if any 302 # wait for lock, if any
292 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 305 Coro::schedule;
… …
300 311
301 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
302 lock_wait $key; 313 lock_wait $key;
303 314
304 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
305 317
306 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
309 } 322 }
310} 323}
311 324
… …
341our @SLOT_QUEUE; 354our @SLOT_QUEUE;
342our $SLOT_QUEUE; 355our $SLOT_QUEUE;
343 356
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
346 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
347 362
348 while () { 363 while () {
349 next_job: 364 next_job:
350 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
358 } 373 }
359 } 374 }
360 } 375 }
361 376
362 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 380 $signal->wait;
366 } else { 381 } else {
367 Coro::schedule; 382 Coro::schedule;
368 } 383 }
… …
412 my $time = Event::time; 427 my $time = Event::time;
413 428
414 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
416 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
417 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
418 # (but this is cancel-safe) 435 # (but this is cancel-safe)
419 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
420 437
421 my $busy = 1; 438 my $busy = 1;
422 my @res; 439 my @res;
423 440
424 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 443 @res = eval { $job->() };
426 warn $@ if $@; 444 warn $@ if $@;
427 undef $busy; 445 undef $busy;
428 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
429 447
430 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
431 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
432 } 454 }
433 455
434 $time = Event::time - $time; 456 $time = Event::time - $time;
435 457
436 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
478sub fork_call(&@) { 500sub fork_call(&@) {
479 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
480 502
481 # we seemingly have to make a local copy of the whole thing, 503 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 504 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 505 # TODO: investigate and fix (likely this will be rather laborious)
484 506
485 my @res = Coro::Util::fork_eval { 507 my @res = Coro::Util::fork_eval {
486 reset_signals; 508 reset_signals;
487 &$cb 509 &$cb
488 }, @args; 510 }, @args;
… …
497=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
498 520
499Stores the given C<$value> in the family. It can currently store binary 521Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
502=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
503 547
504our $DB; 548our $DB;
505 549
506sub db_init { 550sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 551 cf::sync_job {
511 eval { 552 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 553 };
521} 554}
522 555
523sub db_get($$) { 556sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
525 558
… …
575 if (1) { 608 if (1) {
576 $md5 = 609 $md5 =
577 join "\x00", 610 join "\x00",
578 $processversion, 611 $processversion,
579 map { 612 map {
580 Coro::cede; 613 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 615 } 0.. $#$src;
583 616
584 617
585 my $dbmd5 = db_get cache => "$id/md5"; 618 my $dbmd5 = db_get cache => "$id/md5";
… …
937 970
938=cut 971=cut
939 972
940############################################################################# 973#############################################################################
941# object support 974# object support
942#
943 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
944sub _can_merge { 1009sub _can_merge {
945 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
946 1011
947 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1013
951 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
952} 1016}
953 1017
954sub reattach { 1018sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1004sub object_freezer_save { 1068sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1006 1070
1007 sync_job { 1071 sync_job {
1008 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1011 1076
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1081 close $fh;
1017 1082
1018 if (@$objs) { 1083 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1089 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1091 }
… …
1034 } 1099 }
1035 } else { 1100 } else {
1036 aio_unlink $filename; 1101 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1038 } 1103 }
1039 } 1104 };
1040} 1105}
1041 1106
1042sub object_freezer_as_string { 1107sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1044 1109
… …
1056 or return; 1121 or return;
1057 1122
1058 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1125 or return;
1061 $av = eval { (Storable::thaw $av)->{objs} };
1062 }
1063 1126
1127 my $st = eval { Coro::Storable::thaw $av }
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs};
1130 }
1131
1132 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1134 $decname, length $data, scalar @{$av || []};
1135
1066 return ($data, $av); 1136 ($data, $av)
1067} 1137}
1068 1138
1069=head2 COMMAND CALLBACKS 1139=head2 COMMAND CALLBACKS
1070 1140
1071=over 4 1141=over 4
… …
1149 my ($type, $reply, @payload) = 1219 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1220 "ARRAY" eq ref $msg
1151 ? @$msg 1221 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1222 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1223
1224 my @reply;
1225
1154 if (my $cb = $EXTCMD{$type}) { 1226 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1227 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1228 }
1229
1230 $pl->ext_reply ($reply, @reply)
1231 if $reply;
1232
1160 } else { 1233 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1234 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1235 }
1163 1236
1164 cf::override; 1237 cf::override;
… …
1254 1327
1255=head3 cf::player 1328=head3 cf::player
1256 1329
1257=over 4 1330=over 4
1258 1331
1332=item cf::player::num_playing
1333
1334Returns the official number of playing players, as per the Crossfire metaserver rules.
1335
1336=cut
1337
1338sub num_playing {
1339 scalar grep
1340 $_->ob->map
1341 && !$_->hidden
1342 && !$_->ob->flag (cf::FLAG_WIZ),
1343 cf::player::list
1344}
1345
1259=item cf::player::find $login 1346=item cf::player::find $login
1260 1347
1261Returns the given player object, loading it if necessary (might block). 1348Returns the given player object, loading it if necessary (might block).
1262 1349
1263=cut 1350=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1385 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1386 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1387 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1389
1303 my $pl = load_pl path $login 1390 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1391 or return;
1392
1393 my $pl = cf::player::load_pl $f
1394 or return;
1395 local $cf::PLAYER_LOADING{$login} = $pl;
1396 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
1306 } 1398 }
1307 } 1399 }
1308} 1400}
1309 1401
… …
1319 1411
1320 aio_mkdir playerdir $pl, 0770; 1412 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1413 $pl->{last_save} = $cf::RUNTIME;
1322 1414
1323 $pl->save_pl ($path); 1415 $pl->save_pl ($path);
1324 Coro::cede; 1416 cf::cede_to_tick;
1325} 1417}
1326 1418
1327sub new($) { 1419sub new($) {
1328 my ($login) = @_; 1420 my ($login) = @_;
1329 1421
… …
1407 or return []; 1499 or return [];
1408 1500
1409 my @logins; 1501 my @logins;
1410 1502
1411 for my $login (@$dirs) { 1503 for my $login (@$dirs) {
1504 my $path = path $login;
1505
1506 # a .pst is a dead give-away for a valid player
1507 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1509 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1510 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 }
1415 1512
1416 utf8::decode $login; 1513 utf8::decode $login;
1417 push @logins, $login; 1514 push @logins, $login;
1418 } 1515 }
1419 1516
… …
1457sub expand_cfpod { 1554sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1555 ((my $self), (local $_)) = @_;
1459 1556
1460 # escape & and < 1557 # escape & and <
1461 s/&/&amp;/g; 1558 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1559 s/(?<![BIUGHT])</&lt;/g;
1463 1560
1464 # this is buggy, it needs to properly take care of nested <'s 1561 # this is buggy, it needs to properly take care of nested <'s
1465 1562
1466 1 while 1563 1 while
1467 # replace B<>, I<>, U<> etc. 1564 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1565 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1566 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1567 || s/U<([^\>]*)>/<u>$1<\/u>/
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1569 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1570 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1571 $self->gender ? $2 : $1
1474 }ge 1572 }ge
1475 # replace H<hint text> 1573 # replace H<hint text>
… …
1505=cut 1603=cut
1506 1604
1507sub ext_reply($$@) { 1605sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1606 my ($self, $id, @msg) = @_;
1509 1607
1510 if ($self->ns->extcmd == 2) { 1608 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1609}
1518 1610
1519=item $player->ext_msg ($type, @msg) 1611=item $player->ext_msg ($type, @msg)
1520 1612
1521Sends an ext event to the client. 1613Sends an ext event to the client.
… …
1749 1841
1750sub load_header_from($) { 1842sub load_header_from($) {
1751 my ($self, $path) = @_; 1843 my ($self, $path) = @_;
1752 1844
1753 utf8::encode $path; 1845 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1846 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1847 or return;
1848
1849 $self->_load_header ($f)
1850 or return;
1851
1852 local $MAP_LOADING{$self->{path}} = $self;
1853 $f->resolve_delayed_derefs;
1759 1854
1760 $self->{load_path} = $path; 1855 $self->{load_path} = $path;
1761 1856
1762 1 1857 1
1763} 1858}
… …
1817sub find { 1912sub find {
1818 my ($path, $origin) = @_; 1913 my ($path, $origin) = @_;
1819 1914
1820 $path = normalise $path, $origin && $origin->path; 1915 $path = normalise $path, $origin && $origin->path;
1821 1916
1917 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1918 cf::lock_wait "map_find:$path";
1823 1919
1824 $cf::MAP{$path} || do { 1920 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1923
1826 my $map = new_from_path cf::map $path 1924 my $map = new_from_path cf::map $path
1827 or return; 1925 or return;
1828 1926
1829 $map->{last_save} = $cf::RUNTIME; 1927 $map->{last_save} = $cf::RUNTIME;
1830 1928
… …
1832 or return; 1930 or return;
1833 1931
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1933 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1934 #$cf::WAIT_FOR_TICK->wait;
1935 undef $guard1;
1936 undef $guard2;
1837 $map->reset; 1937 $map->reset;
1838 undef $guard;
1839 return find $path; 1938 return find $path;
1840 } 1939 }
1841 1940
1842 $cf::MAP{$path} = $map 1941 $cf::MAP{$path} = $map
1843 } 1942 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1951 local $self->{deny_reset} = 1; # loading can take a long time
1853 1952
1854 my $path = $self->{path}; 1953 my $path = $self->{path};
1855 1954
1856 { 1955 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1956 my $guard = cf::lock_acquire "map_data:$path";
1858 1957
1958 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1959 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 1960
1861 $self->in_memory (cf::MAP_LOADING); 1961 $self->in_memory (cf::MAP_LOADING);
1862 1962
1863 $self->alloc; 1963 $self->alloc;
1864 1964
1865 $self->pre_load; 1965 $self->pre_load;
1866 Coro::cede; 1966 cf::cede_to_tick;
1867 1967
1968 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 1970 $self->_load_objects ($f)
1869 or return; 1971 or return;
1870 1972
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 1974 if delete $self->{load_original};
1873 1975
1874 if (my $uniq = $self->uniq_path) { 1976 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 1977 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 1978 unless (aio_stat $uniq) {
1979 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 1980 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1981 $self->_load_objects ($f);
1982 $f->resolve_delayed_derefs;
1983 }
1879 } 1984 }
1880 } 1985 }
1881 1986
1882 Coro::cede; 1987 $f->resolve_delayed_derefs;
1988
1989 cf::cede_to_tick;
1883 # now do the right thing for maps 1990 # now do the right thing for maps
1884 $self->link_multipart_objects; 1991 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1992 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1993 unless $self->difficulty;
1887 Coro::cede; 1994 cf::cede_to_tick;
1888 1995
1889 unless ($self->{deny_activate}) { 1996 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1997 $self->decay_objects;
1891 $self->fix_auto_apply; 1998 $self->fix_auto_apply;
1892 $self->update_buttons; 1999 $self->update_buttons;
1893 Coro::cede; 2000 cf::cede_to_tick;
1894 $self->set_darkness_map; 2001 $self->set_darkness_map;
1895 Coro::cede; 2002 cf::cede_to_tick;
1896 $self->activate; 2003 $self->activate;
1897 } 2004 }
1898 2005
1899 $self->{last_save} = $cf::RUNTIME; 2006 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2007 $self->last_access ($cf::RUNTIME);
… …
1916 2023
1917 $self 2024 $self
1918} 2025}
1919 2026
1920# find and load all maps in the 3x3 area around a map 2027# find and load all maps in the 3x3 area around a map
1921sub load_diag { 2028sub load_neighbours {
1922 my ($map) = @_; 2029 my ($map) = @_;
1923 2030
1924 my @diag; # diagonal neighbours 2031 my @neigh; # diagonal neighbours
1925 2032
1926 for (0 .. 3) { 2033 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 2034 my $neigh = $map->tile_path ($_)
1928 or next; 2035 or next;
1929 $neigh = find $neigh, $map 2036 $neigh = find $neigh, $map
1930 or next; 2037 or next;
1931 $neigh->load; 2038 $neigh->load;
1932 2039
2040 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2041 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2042 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2043 }
1936 2044
1937 for (@diag) { 2045 for (grep defined $_->[0], @neigh) {
2046 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2047 my $neigh = find $path, $origin
1939 or next; 2048 or next;
1940 $neigh->load; 2049 $neigh->load;
1941 } 2050 }
1942} 2051}
1943 2052
… …
1948} 2057}
1949 2058
1950sub do_load_sync { 2059sub do_load_sync {
1951 my ($map) = @_; 2060 my ($map) = @_;
1952 2061
2062 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2063 if $Coro::current == $Coro::main;
2064
1953 cf::sync_job { $map->load }; 2065 cf::sync_job { $map->load };
1954} 2066}
1955 2067
1956our %MAP_PREFETCH; 2068our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2069our $MAP_PREFETCHER = undef;
1958 2070
1959sub find_async { 2071sub find_async {
1960 my ($path, $origin) = @_; 2072 my ($path, $origin, $load) = @_;
1961 2073
1962 $path = normalise $path, $origin && $origin->{path}; 2074 $path = normalise $path, $origin && $origin->{path};
1963 2075
1964 if (my $map = $cf::MAP{$path}) { 2076 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 2078 }
1967 2079
1968 undef $MAP_PREFETCH{$path}; 2080 $MAP_PREFETCH{$path} |= $load;
2081
1969 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
1970 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2087 if (my $map = find $k) {
1973 $map->load; 2088 $map->load if $v;
1974 } 2089 }
1975 2090
1976 delete $MAP_PREFETCH{$path}; 2091 delete $MAP_PREFETCH{$k};
1977 } 2092 }
1978 } 2093 }
1979 undef $MAP_PREFETCHER; 2094 undef $MAP_PREFETCHER;
1980 }; 2095 };
1981 $MAP_PREFETCHER->prio (6); 2096 $MAP_PREFETCHER->prio (6);
… …
1984} 2099}
1985 2100
1986sub save { 2101sub save {
1987 my ($self) = @_; 2102 my ($self) = @_;
1988 2103
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2105
1991 $self->{last_save} = $cf::RUNTIME; 2106 $self->{last_save} = $cf::RUNTIME;
1992 2107
1993 return unless $self->dirty; 2108 return unless $self->dirty;
1994 2109
… …
2000 return if $self->{deny_save}; 2115 return if $self->{deny_save};
2001 2116
2002 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
2003 2118
2004 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
2006 }; 2122 };
2007 2123
2008 if ($uniq) { 2124 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2017 my ($self) = @_; 2133 my ($self) = @_;
2018 2134
2019 # save first because save cedes 2135 # save first because save cedes
2020 $self->save; 2136 $self->save;
2021 2137
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2138 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2139
2024 return if $self->players; 2140 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2141 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2142 return if $self->{deny_save};
2027 2143
2144 $self->in_memory (cf::MAP_SWAPPED);
2145
2146 $self->deactivate;
2147 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2148 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2149}
2031 2150
2032sub reset_at { 2151sub reset_at {
2033 my ($self) = @_; 2152 my ($self) = @_;
2034 2153
… …
2066 if $uniq; 2185 if $uniq;
2067 } 2186 }
2068 2187
2069 delete $cf::MAP{$self->path}; 2188 delete $cf::MAP{$self->path};
2070 2189
2190 $self->deactivate;
2191 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2192 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2193
2075 $self->unlink_save; 2194 $self->unlink_save;
2076 $self->destroy; 2195 $self->destroy;
2077} 2196}
2078 2197
2079my $nuke_counter = "aaaa"; 2198my $nuke_counter = "aaaa";
2080 2199
2081sub nuke { 2200sub nuke {
2082 my ($self) = @_; 2201 my ($self) = @_;
2083 2202
2203 {
2204 my $lock = cf::lock_acquire "map_data:$self->{path}";
2205
2084 delete $cf::MAP{$self->path}; 2206 delete $cf::MAP{$self->path};
2085 2207
2086 $self->unlink_save; 2208 $self->unlink_save;
2087 2209
2088 bless $self, "cf::map"; 2210 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2211 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2212 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2213 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2214 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2215
2094 $cf::MAP{$self->path} = $self; 2216 $cf::MAP{$self->path} = $self;
2217 }
2095 2218
2096 $self->reset; # polite request, might not happen 2219 $self->reset; # polite request, might not happen
2097} 2220}
2098 2221
2099=item $maps = cf::map::tmp_maps 2222=item $maps = cf::map::tmp_maps
… …
2175 2298
2176sub inv_recursive { 2299sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2300 inv_recursive_ inv $_[0]
2178} 2301}
2179 2302
2303=item $ref = $ob->ref
2304
2305creates and returns a persistent reference to an objetc that can be stored as a string.
2306
2307=item $ob = cf::object::deref ($refstring)
2308
2309returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2310even if the object actually exists. May block.
2311
2312=cut
2313
2314sub deref {
2315 my ($ref) = @_;
2316
2317 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2318 my ($uuid, $name) = ($1, $2);
2319 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2320 or return;
2321 $pl->ob->uuid eq $uuid
2322 or return;
2323
2324 $pl->ob
2325 } else {
2326 warn "$ref: cannot resolve object reference\n";
2327 undef
2328 }
2329}
2330
2180package cf; 2331package cf;
2181 2332
2182=back 2333=back
2183 2334
2184=head3 cf::object::player 2335=head3 cf::object::player
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2463 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2464 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2465 if $x <=0 && $y <= 0;
2315 2466
2316 $map->load; 2467 $map->load;
2317 $map->load_diag; 2468 $map->load_neighbours;
2318 2469
2319 return unless $self->contr->active; 2470 return unless $self->contr->active;
2320 $self->activate_recursive; 2471 $self->activate_recursive;
2321 2472
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2473 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2494
2344 $self->enter_link; 2495 $self->enter_link;
2345 2496
2346 (async { 2497 (async {
2498 $Coro::current->{desc} = "player::goto $path $x $y";
2499
2500 # *tag paths override both path and x|y
2501 if ($path =~ /^\*(.*)$/) {
2502 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2503 my $ob = $obs[rand @obs];
2504
2505 # see if we actually can go there
2506 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2507 $ob = $obs[rand @obs];
2508 } else {
2509 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2510 }
2511 # else put us there anyways for now #d#
2512
2513 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2514 } else {
2515 ($path, $x, $y) = (undef, undef, undef);
2516 }
2517 }
2518
2347 my $map = eval { 2519 my $map = eval {
2348 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
2349 2521
2350 if ($map) { 2522 if ($map) {
2351 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
2353 } else { 2525 } else {
2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2526 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2355 } 2527 }
2356 2528
2357 $map 2529 $map
2358 }; 2530 };
2359 2531
… …
2449 # if exit is damned, update players death & WoR home-position 2621 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp) 2622 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED); 2623 if $exit->flag (FLAG_DAMNED);
2452 2624
2453 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2454 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2455 unless (eval { 2629 unless (eval {
2456 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2457 2631
2458 1; 2632 1;
… …
2493the message, with C<log> being the default. If C<$color> is negative, suppress 2667the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2668the message unless the client supports the msg packet.
2495 2669
2496=cut 2670=cut
2497 2671
2672our %CHANNEL = (
2673 "c/identify" => {
2674 id => "infobox",
2675 title => "Identify",
2676 reply => undef,
2677 tooltip => "Items recently identified",
2678 },
2679 "c/examine" => {
2680 id => "infobox",
2681 title => "Examine",
2682 reply => undef,
2683 tooltip => "Signs and other items you examined",
2684 },
2685 "c/lookat" => {
2686 id => "infobox",
2687 title => "Look",
2688 reply => undef,
2689 tooltip => "What you saw there",
2690 },
2691);
2692
2498sub cf::client::send_msg { 2693sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2694 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2695
2501 $msg = $self->pl->expand_cfpod ($msg); 2696 $msg = $self->pl->expand_cfpod ($msg);
2502 2697
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2698 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 2699
2700 # check predefined channels, for the benefit of C
2701 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel};
2703
2704 $self->ext_msg (channel_info => $channel)
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id};
2708
2505 if (ref $channel) { 2709 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 2710 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2711 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2712 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2713 $self->ext_msg (channel_info => $channel)
2714 if $self->can_msg;
2510 } 2715 }
2511 2716
2512 $channel = $channel->{id}; 2717 $channel = $channel->{id};
2513 } 2718 }
2514 2719
… …
2555=cut 2760=cut
2556 2761
2557sub cf::client::ext_msg($$@) { 2762sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2763 my ($self, $type, @msg) = @_;
2559 2764
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2765 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2766 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2767 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2768 push @msg, msgtype => "event_$type";
2769 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2770 }
2771}
2772
2773=item $client->ext_reply ($msgid, @msg)
2774
2775Sends an ext reply to the client.
2776
2777=cut
2778
2779sub cf::client::ext_reply($$@) {
2780 my ($self, $id, @msg) = @_;
2781
2782 if ($self->extcmd == 2) {
2783 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2784 } elsif ($self->extcmd == 1) {
2785 #TODO: version 1, remove
2786 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2787 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2788 }
2568} 2789}
2569 2790
2570=item $success = $client->query ($flags, "text", \&cb) 2791=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2853 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2854 "ARRAY" eq ref $msg
2634 ? @$msg 2855 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2856 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2857
2858 my @reply;
2859
2637 if (my $cb = $EXTICMD{$type}) { 2860 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2861 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2862 }
2863
2864 $ns->ext_reply ($reply, @reply)
2865 if $reply;
2866
2643 } else { 2867 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2868 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2869 }
2646 2870
2647 cf::override; 2871 cf::override;
… …
2707=pod 2931=pod
2708 2932
2709The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2710 2934
2711 cf::object 2935 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2936 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove name archname title slaying race 2937 insert remove name archname title slaying race decrease_ob_nr
2714 2938
2715 cf::object::player 2939 cf::object::player
2716 player 2940 player
2717 2941
2718 cf::player 2942 cf::player
… …
2723 2947
2724=cut 2948=cut
2725 2949
2726for ( 2950for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 2952 insert remove inv name archname title slaying race
2953 decrease_ob_nr destroy)],
2729 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2732) { 2957) {
2733 no strict 'refs'; 2958 no strict 'refs';
… …
2809# the server's init and main functions 3034# the server's init and main functions
2810 3035
2811sub load_facedata($) { 3036sub load_facedata($) {
2812 my ($path) = @_; 3037 my ($path) = @_;
2813 3038
3039 # HACK to clear player env face cache, we need some signal framework
3040 # for this (global event?)
3041 %ext::player_env::MUSIC_FACE_CACHE = ();
3042
3043 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3044
2814 warn "loading facedata from $path\n"; 3045 warn "loading facedata from $path\n";
2815 3046
2816 my $facedata; 3047 my $facedata;
2817 0 < aio_load $path, $facedata 3048 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3049 or die "$path: $!";
2819 3050
2820 $facedata = Coro::Storable::thaw $facedata; 3051 $facedata = Coro::Storable::thaw $facedata;
2821 3052
2822 $facedata->{version} == 2 3053 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3054 or cf::cleanup "$path: version mismatch, cannot proceed.";
3055
3056 # patch in the exptable
3057 $facedata->{resource}{"res/exp_table"} = {
3058 type => FT_RSRC,
3059 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3060 };
3061 cf::cede_to_tick;
2824 3062
2825 { 3063 {
2826 my $faces = $facedata->{faceinfo}; 3064 my $faces = $facedata->{faceinfo};
2827 3065
2828 while (my ($face, $info) = each %$faces) { 3066 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3067 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 3068 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3069 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3070 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3071 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3072
2835 cf::cede_to_tick; 3073 cf::cede_to_tick;
2836 } 3074 }
2837 3075
2838 while (my ($face, $info) = each %$faces) { 3076 while (my ($face, $info) = each %$faces) {
… …
2863 3101
2864 { 3102 {
2865 # TODO: for gcfclient pleasure, we should give resources 3103 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3104 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3105 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3106
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3107 my $soundconf = delete $res->{"res/sound.conf"};
2871 3108
2872 while (my ($name, $info) = each %$res) { 3109 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3110 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3111 my $data;
2879 3112
2880 if ($info->{type} & 1) { 3113 if ($info->{type} & 1) {
2881 # prepend meta info 3114 # prepend meta info
2882 3115
3116 my $meta = $enc->encode ({
3117 name => $name,
3118 %{ $info->{meta} || {} },
3119 });
3120
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3121 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else { 3122 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3123 $data = $info->{data};
2889 } 3124 }
2890 3125
3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3127 cf::face::set_type $idx, $info->{type};
2892 3128
2893 cf::cede_to_tick; 3129 cf::cede_to_tick;
2894 } 3130 }
2895 3131
… …
2922 $ns->fx_want ($k, $v); 3158 $ns->fx_want ($k, $v);
2923 } 3159 }
2924}; 3160};
2925 3161
2926sub reload_regions { 3162sub reload_regions {
3163 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = ();
3166
2927 load_resource_file "$MAPDIR/regions" 3167 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3168 or die "unable to load regions file\n";
2929 3169
2930 for (cf::region::list) { 3170 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3171 $_->{match} = qr/$_->{match}/
… …
2967 3207
2968sub init { 3208sub init {
2969 reload_resources; 3209 reload_resources;
2970} 3210}
2971 3211
2972sub cfg_load { 3212sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3213 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3214 or return;
2975 3215
2976 local $/; 3216 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3217 *CFG = YAML::Syck::Load <$fh>;
… …
2993sub main { 3233sub main {
2994 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
2996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2997 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
2998 Event::one_event; 3239 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
3000 }; 3241 };
3001 3242
3002 cfg_load; 3243 reload_config;
3003 db_init; 3244 db_init;
3004 load_extensions; 3245 load_extensions;
3005 3246
3006 $TICK_WATCHER->start; 3247 $TICK_WATCHER->start;
3007 Event::loop; 3248 Event::loop;
… …
3074 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
3075 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
3076 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
3077 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
3078 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079 $pl->save; 3321 $pl->save;
3080 } 3322 }
3081 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
3082 3324
3083 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
… …
3131 3373
3132 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
3133 for (;;) { 3375 for (;;) {
3134 BDB::flush; 3376 BDB::flush;
3135 IO::AIO::flush; 3377 IO::AIO::flush;
3136 Coro::cede; 3378 Coro::cede_notself;
3137 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
3138 warn "iterate..."; 3380 warn "iterate...";
3139 } 3381 }
3140 3382
3141 ++$RELOAD; 3383 ++$RELOAD;
… …
3200 warn "reloading cf.pm"; 3442 warn "reloading cf.pm";
3201 require cf; 3443 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3445
3204 warn "loading config and database again"; 3446 warn "loading config and database again";
3205 cf::cfg_load; 3447 cf::reload_config;
3206 3448
3207 warn "loading extensions"; 3449 warn "loading extensions";
3208 cf::load_extensions; 3450 cf::load_extensions;
3209 3451
3210 warn "reattaching attachments to objects/players"; 3452 warn "reattaching attachments to objects/players";
… …
3246register_command "reload" => sub { 3488register_command "reload" => sub {
3247 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
3248 3490
3249 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 3495 reload_perl;
3496 };
3252 } 3497 }
3253}; 3498};
3254 3499
3255unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
3256 3501
… …
3275 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3522 $signal->wait;
3278} 3523}
3279 3524
3280 my $min = 1e6;#d#
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
3283 reentrant => 0, 3526 reentrant => 0,
3284 parked => 1, 3527 parked => 1,
3285 prio => 0, 3528 prio => 0,
3286 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
… …
3294 3537
3295 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
3296 3539
3297 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
3298 3541
3299 0 && sync_job {#d#
3300 for(1..10) {
3301 my $t = Event::time;
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3303 or die;
3304
3305 $map->width (50);
3306 $map->height (50);
3307 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1);
3309 my $t = Event::time - $t;
3310
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 };
3321
3322 $RUNTIME += $TICK; 3542 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
3324 3544
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
3328 write_runtime 3549 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
3330 }; 3551 };
3331 } 3552 }
3332 3553
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3555 $sig->send;
3338 } 3556 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3558 $sig->send;
… …
3350 3568
3351 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3571
3354 _post_tick; 3572 _post_tick;
3355
3356
3357 }, 3573 },
3358); 3574);
3359 3575
3360{ 3576{
3577 BDB::min_parallel 8;
3361 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
3362 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
3363 reentrant => 0, 3580 reentrant => 0,
3364 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
3365 poll => 'r', 3582 poll => 'r',
3366 prio => 0, 3583 prio => 0,
3367 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
3369 ); 3586 );
3370 BDB::min_parallel 8;
3371 3587
3372 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
3373 my $status; 3589 my $status;
3374 my $current = $Coro::current; 3590 my $current = $Coro::current;
3375 ( 3591 (
… …
3384 ) 3600 )
3385 }; 3601 };
3386 3602
3387 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 3604 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1);
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 3609
3390 cf::sync_job { 3610 cf::sync_job {
3391 eval { 3611 eval {
3392 BDB::db_env_open 3612 BDB::db_env_open
3393 $DB_ENV, 3613 $DB_ENV,
… …
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3615 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3617 0666;
3398 3618
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 }; 3620 };
3404 3621
3405 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3623 };
3407 } 3624 }
3625
3626 $BDB_DEADLOCK_WATCHER = Event->timer (
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 );
3636 $BDB_CHECKPOINT_WATCHER = Event->timer (
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 );
3646 $BDB_TRICKLE_WATCHER = Event->timer (
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 );
3408} 3656}
3409 3657
3410{ 3658{
3411 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
3412 3660
… …
3415 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
3416 reentrant => 0, 3664 reentrant => 0,
3417 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
3419 poll => 'r', 3667 poll => 'r',
3420 prio => 6, 3668 prio => 0,
3421 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
3422 ); 3670 );
3423} 3671}
3424 3672
3425my $_log_backtrace; 3673my $_log_backtrace;
… …
3431 3679
3432 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace; 3682 ++$_log_backtrace;
3435 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
3436 my @bt = fork_call { 3686 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3689 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

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