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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.389 by root, Sat Oct 20 04:39:57 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::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;
1126
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1062 } 1129 }
1063 1130
1131 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1066 return ($data, $av); 1135 ($data, $av)
1067} 1136}
1068 1137
1069=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1070 1139
1071=over 4 1140=over 4
… …
1149 my ($type, $reply, @payload) = 1218 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1219 "ARRAY" eq ref $msg
1151 ? @$msg 1220 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1222
1223 my @reply;
1224
1154 if (my $cb = $EXTCMD{$type}) { 1225 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1226 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
1160 } else { 1232 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1234 }
1163 1235
1164 cf::override; 1236 cf::override;
… …
1254 1326
1255=head3 cf::player 1327=head3 cf::player
1256 1328
1257=over 4 1329=over 4
1258 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1259=item cf::player::find $login 1345=item cf::player::find $login
1260 1346
1261Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1262 1348
1263=cut 1349=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1388
1303 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1306 } 1397 }
1307 } 1398 }
1308} 1399}
1309 1400
… …
1319 1410
1320 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1322 1413
1323 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1324 Coro::cede; 1415 cf::cede_to_tick;
1325} 1416}
1326 1417
1327sub new($) { 1418sub new($) {
1328 my ($login) = @_; 1419 my ($login) = @_;
1329 1420
… …
1407 or return []; 1498 or return [];
1408 1499
1409 my @logins; 1500 my @logins;
1410 1501
1411 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1415 1511
1416 utf8::decode $login; 1512 utf8::decode $login;
1417 push @logins, $login; 1513 push @logins, $login;
1418 } 1514 }
1419 1515
… …
1457sub expand_cfpod { 1553sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1554 ((my $self), (local $_)) = @_;
1459 1555
1460 # escape & and < 1556 # escape & and <
1461 s/&/&amp;/g; 1557 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1558 s/(?<![BIUGHT])</&lt;/g;
1463 1559
1464 # this is buggy, it needs to properly take care of nested <'s 1560 # this is buggy, it needs to properly take care of nested <'s
1465 1561
1466 1 while 1562 1 while
1467 # replace B<>, I<>, U<> etc. 1563 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1564 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1568 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1569 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1570 $self->gender ? $2 : $1
1474 }ge 1571 }ge
1475 # replace H<hint text> 1572 # replace H<hint text>
… …
1505=cut 1602=cut
1506 1603
1507sub ext_reply($$@) { 1604sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1605 my ($self, $id, @msg) = @_;
1509 1606
1510 if ($self->ns->extcmd == 2) { 1607 $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} 1608}
1518 1609
1519=item $player->ext_msg ($type, @msg) 1610=item $player->ext_msg ($type, @msg)
1520 1611
1521Sends an ext event to the client. 1612Sends an ext event to the client.
… …
1749 1840
1750sub load_header_from($) { 1841sub load_header_from($) {
1751 my ($self, $path) = @_; 1842 my ($self, $path) = @_;
1752 1843
1753 utf8::encode $path; 1844 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1845 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1846 or return;
1847
1848 $self->_load_header ($f)
1849 or return;
1850
1851 local $MAP_LOADING{$self->{path}} = $self;
1852 $f->resolve_delayed_derefs;
1759 1853
1760 $self->{load_path} = $path; 1854 $self->{load_path} = $path;
1761 1855
1762 1 1856 1
1763} 1857}
… …
1817sub find { 1911sub find {
1818 my ($path, $origin) = @_; 1912 my ($path, $origin) = @_;
1819 1913
1820 $path = normalise $path, $origin && $origin->path; 1914 $path = normalise $path, $origin && $origin->path;
1821 1915
1916 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1917 cf::lock_wait "map_find:$path";
1823 1918
1824 $cf::MAP{$path} || do { 1919 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1826 my $map = new_from_path cf::map $path 1923 my $map = new_from_path cf::map $path
1827 or return; 1924 or return;
1828 1925
1829 $map->{last_save} = $cf::RUNTIME; 1926 $map->{last_save} = $cf::RUNTIME;
1830 1927
… …
1832 or return; 1929 or return;
1833 1930
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1932 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1933 #$cf::WAIT_FOR_TICK->wait;
1934 undef $guard1;
1935 undef $guard2;
1837 $map->reset; 1936 $map->reset;
1838 undef $guard;
1839 return find $path; 1937 return find $path;
1840 } 1938 }
1841 1939
1842 $cf::MAP{$path} = $map 1940 $cf::MAP{$path} = $map
1843 } 1941 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1950 local $self->{deny_reset} = 1; # loading can take a long time
1853 1951
1854 my $path = $self->{path}; 1952 my $path = $self->{path};
1855 1953
1856 { 1954 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1955 my $guard = cf::lock_acquire "map_data:$path";
1858 1956
1957 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1958 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 1959
1861 $self->in_memory (cf::MAP_LOADING); 1960 $self->in_memory (cf::MAP_LOADING);
1862 1961
1863 $self->alloc; 1962 $self->alloc;
1864 1963
1865 $self->pre_load; 1964 $self->pre_load;
1866 Coro::cede; 1965 cf::cede_to_tick;
1867 1966
1967 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 1969 $self->_load_objects ($f)
1869 or return; 1970 or return;
1870 1971
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 1973 if delete $self->{load_original};
1873 1974
1874 if (my $uniq = $self->uniq_path) { 1975 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 1976 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 1977 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 1979 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1980 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs;
1982 }
1879 } 1983 }
1880 } 1984 }
1881 1985
1882 Coro::cede; 1986 $f->resolve_delayed_derefs;
1987
1988 cf::cede_to_tick;
1883 # now do the right thing for maps 1989 # now do the right thing for maps
1884 $self->link_multipart_objects; 1990 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1991 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1992 unless $self->difficulty;
1887 Coro::cede; 1993 cf::cede_to_tick;
1888 1994
1889 unless ($self->{deny_activate}) { 1995 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1996 $self->decay_objects;
1891 $self->fix_auto_apply; 1997 $self->fix_auto_apply;
1892 $self->update_buttons; 1998 $self->update_buttons;
1893 Coro::cede; 1999 cf::cede_to_tick;
1894 $self->set_darkness_map; 2000 $self->set_darkness_map;
1895 Coro::cede; 2001 cf::cede_to_tick;
1896 $self->activate; 2002 $self->activate;
1897 } 2003 }
1898 2004
1899 $self->{last_save} = $cf::RUNTIME; 2005 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2006 $self->last_access ($cf::RUNTIME);
… …
1916 2022
1917 $self 2023 $self
1918} 2024}
1919 2025
1920# find and load all maps in the 3x3 area around a map 2026# find and load all maps in the 3x3 area around a map
1921sub load_diag { 2027sub load_neighbours {
1922 my ($map) = @_; 2028 my ($map) = @_;
1923 2029
1924 my @diag; # diagonal neighbours 2030 my @neigh; # diagonal neighbours
1925 2031
1926 for (0 .. 3) { 2032 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 2033 my $neigh = $map->tile_path ($_)
1928 or next; 2034 or next;
1929 $neigh = find $neigh, $map 2035 $neigh = find $neigh, $map
1930 or next; 2036 or next;
1931 $neigh->load; 2037 $neigh->load;
1932 2038
2039 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2040 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2041 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2042 }
1936 2043
1937 for (@diag) { 2044 for (grep defined $_->[0], @neigh) {
2045 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2046 my $neigh = find $path, $origin
1939 or next; 2047 or next;
1940 $neigh->load; 2048 $neigh->load;
1941 } 2049 }
1942} 2050}
1943 2051
… …
1948} 2056}
1949 2057
1950sub do_load_sync { 2058sub do_load_sync {
1951 my ($map) = @_; 2059 my ($map) = @_;
1952 2060
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main;
2063
1953 cf::sync_job { $map->load }; 2064 cf::sync_job { $map->load };
1954} 2065}
1955 2066
1956our %MAP_PREFETCH; 2067our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2068our $MAP_PREFETCHER = undef;
1958 2069
1959sub find_async { 2070sub find_async {
1960 my ($path, $origin) = @_; 2071 my ($path, $origin, $load) = @_;
1961 2072
1962 $path = normalise $path, $origin && $origin->{path}; 2073 $path = normalise $path, $origin && $origin->{path};
1963 2074
1964 if (my $map = $cf::MAP{$path}) { 2075 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 2077 }
1967 2078
1968 undef $MAP_PREFETCH{$path}; 2079 $MAP_PREFETCH{$path} |= $load;
2080
1969 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
1970 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2086 if (my $map = find $k) {
1973 $map->load; 2087 $map->load if $v;
1974 } 2088 }
1975 2089
1976 delete $MAP_PREFETCH{$path}; 2090 delete $MAP_PREFETCH{$k};
1977 } 2091 }
1978 } 2092 }
1979 undef $MAP_PREFETCHER; 2093 undef $MAP_PREFETCHER;
1980 }; 2094 };
1981 $MAP_PREFETCHER->prio (6); 2095 $MAP_PREFETCHER->prio (6);
… …
1984} 2098}
1985 2099
1986sub save { 2100sub save {
1987 my ($self) = @_; 2101 my ($self) = @_;
1988 2102
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2104
1991 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
1992 2106
1993 return unless $self->dirty; 2107 return unless $self->dirty;
1994 2108
… …
2000 return if $self->{deny_save}; 2114 return if $self->{deny_save};
2001 2115
2002 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
2003 2117
2004 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
2006 }; 2121 };
2007 2122
2008 if ($uniq) { 2123 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2017 my ($self) = @_; 2132 my ($self) = @_;
2018 2133
2019 # save first because save cedes 2134 # save first because save cedes
2020 $self->save; 2135 $self->save;
2021 2136
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2138
2024 return if $self->players; 2139 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2141 return if $self->{deny_save};
2027 2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2147 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2148}
2031 2149
2032sub reset_at { 2150sub reset_at {
2033 my ($self) = @_; 2151 my ($self) = @_;
2034 2152
… …
2066 if $uniq; 2184 if $uniq;
2067 } 2185 }
2068 2186
2069 delete $cf::MAP{$self->path}; 2187 delete $cf::MAP{$self->path};
2070 2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2191 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2192
2075 $self->unlink_save; 2193 $self->unlink_save;
2076 $self->destroy; 2194 $self->destroy;
2077} 2195}
2078 2196
2079my $nuke_counter = "aaaa"; 2197my $nuke_counter = "aaaa";
2080 2198
2081sub nuke { 2199sub nuke {
2082 my ($self) = @_; 2200 my ($self) = @_;
2083 2201
2202 {
2203 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204
2084 delete $cf::MAP{$self->path}; 2205 delete $cf::MAP{$self->path};
2085 2206
2086 $self->unlink_save; 2207 $self->unlink_save;
2087 2208
2088 bless $self, "cf::map"; 2209 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2210 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2211 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2212 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2214
2094 $cf::MAP{$self->path} = $self; 2215 $cf::MAP{$self->path} = $self;
2216 }
2095 2217
2096 $self->reset; # polite request, might not happen 2218 $self->reset; # polite request, might not happen
2097} 2219}
2098 2220
2099=item $maps = cf::map::tmp_maps 2221=item $maps = cf::map::tmp_maps
… …
2175 2297
2176sub inv_recursive { 2298sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2299 inv_recursive_ inv $_[0]
2178} 2300}
2179 2301
2302=item $ref = $ob->ref
2303
2304creates and returns a persistent reference to an objetc that can be stored as a string.
2305
2306=item $ob = cf::object::deref ($refstring)
2307
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block.
2310
2311=cut
2312
2313sub deref {
2314 my ($ref) = @_;
2315
2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2317 my ($uuid, $name) = ($1, $2);
2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2319 or return;
2320 $pl->ob->uuid eq $uuid
2321 or return;
2322
2323 $pl->ob
2324 } else {
2325 warn "$ref: cannot resolve object reference\n";
2326 undef
2327 }
2328}
2329
2180package cf; 2330package cf;
2181 2331
2182=back 2332=back
2183 2333
2184=head3 cf::object::player 2334=head3 cf::object::player
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2462 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2463 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2464 if $x <=0 && $y <= 0;
2315 2465
2316 $map->load; 2466 $map->load;
2317 $map->load_diag; 2467 $map->load_neighbours;
2318 2468
2319 return unless $self->contr->active; 2469 return unless $self->contr->active;
2320 $self->activate_recursive; 2470 $self->activate_recursive;
2321 2471
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2493
2344 $self->enter_link; 2494 $self->enter_link;
2345 2495
2346 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2499 # *tag paths override both path and x|y
2500 if ($path =~ /^\*(.*)$/) {
2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2502 my $ob = $obs[rand @obs];
2503
2504 # see if we actually can go there
2505 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2506 $ob = $obs[rand @obs];
2507 } else {
2508 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2509 }
2510 # else put us there anyways for now #d#
2511
2512 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2513 } else {
2514 ($path, $x, $y) = (undef, undef, undef);
2515 }
2516 }
2517
2347 my $map = eval { 2518 my $map = eval {
2348 my $map = cf::map::find $path; 2519 my $map = defined $path ? cf::map::find $path : undef;
2349 2520
2350 if ($map) { 2521 if ($map) {
2351 $map = $map->customise_for ($self); 2522 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2523 $map = $check->($map) if $check && $map;
2353 } else { 2524 } else {
2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2355 } 2526 }
2356 2527
2357 $map 2528 $map
2358 }; 2529 };
2359 2530
… …
2449 # if exit is damned, update players death & WoR home-position 2620 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp) 2621 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED); 2622 if $exit->flag (FLAG_DAMNED);
2452 2623
2453 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2454 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2455 unless (eval { 2628 unless (eval {
2456 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2457 2630
2458 1; 2631 1;
… …
2493the message, with C<log> being the default. If C<$color> is negative, suppress 2666the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2667the message unless the client supports the msg packet.
2495 2668
2496=cut 2669=cut
2497 2670
2671our %CHANNEL = (
2672 "c/identify" => {
2673 id => "infobox",
2674 title => "Identify",
2675 reply => undef,
2676 tooltip => "Items recently identified",
2677 },
2678 "c/examine" => {
2679 id => "infobox",
2680 title => "Examine",
2681 reply => undef,
2682 tooltip => "Signs and other items you examined",
2683 },
2684 "c/book" => {
2685 id => "infobox",
2686 title => "Book",
2687 reply => undef,
2688 tooltip => "The contents of a note or book",
2689 },
2690 "c/lookat" => {
2691 id => "infobox",
2692 title => "Look",
2693 reply => undef,
2694 tooltip => "What you saw there",
2695 },
2696);
2697
2498sub cf::client::send_msg { 2698sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2699 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2700
2501 $msg = $self->pl->expand_cfpod ($msg); 2701 $msg = $self->pl->expand_cfpod ($msg);
2502 2702
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2703 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 2704
2705 # check predefined channels, for the benefit of C
2706 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel};
2708
2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id};
2713
2505 if (ref $channel) { 2714 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 2715 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2716 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2717 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2718 $self->ext_msg (channel_info => $channel)
2719 if $self->can_msg;
2510 } 2720 }
2511 2721
2512 $channel = $channel->{id}; 2722 $channel = $channel->{id};
2513 } 2723 }
2514 2724
… …
2555=cut 2765=cut
2556 2766
2557sub cf::client::ext_msg($$@) { 2767sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2768 my ($self, $type, @msg) = @_;
2559 2769
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2770 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2771 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2772 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2773 push @msg, msgtype => "event_$type";
2774 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2775 }
2776}
2777
2778=item $client->ext_reply ($msgid, @msg)
2779
2780Sends an ext reply to the client.
2781
2782=cut
2783
2784sub cf::client::ext_reply($$@) {
2785 my ($self, $id, @msg) = @_;
2786
2787 if ($self->extcmd == 2) {
2788 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2789 } elsif ($self->extcmd == 1) {
2790 #TODO: version 1, remove
2791 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2792 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2793 }
2568} 2794}
2569 2795
2570=item $success = $client->query ($flags, "text", \&cb) 2796=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2858 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2859 "ARRAY" eq ref $msg
2634 ? @$msg 2860 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2861 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2862
2863 my @reply;
2864
2637 if (my $cb = $EXTICMD{$type}) { 2865 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2866 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2867 }
2868
2869 $ns->ext_reply ($reply, @reply)
2870 if $reply;
2871
2643 } else { 2872 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2873 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2874 }
2646 2875
2647 cf::override; 2876 cf::override;
… …
2707=pod 2936=pod
2708 2937
2709The following functions and methods are available within a safe environment: 2938The following functions and methods are available within a safe environment:
2710 2939
2711 cf::object 2940 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2941 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove name archname title slaying race 2942 insert remove name archname title slaying race decrease_ob_nr
2714 2943
2715 cf::object::player 2944 cf::object::player
2716 player 2945 player
2717 2946
2718 cf::player 2947 cf::player
… …
2723 2952
2724=cut 2953=cut
2725 2954
2726for ( 2955for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2956 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 2957 insert remove inv name archname title slaying race
2958 decrease_ob_nr destroy)],
2729 ["cf::object::player" => qw(player)], 2959 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2960 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2961 ["cf::map" => qw(trigger)],
2732) { 2962) {
2733 no strict 'refs'; 2963 no strict 'refs';
… …
2809# the server's init and main functions 3039# the server's init and main functions
2810 3040
2811sub load_facedata($) { 3041sub load_facedata($) {
2812 my ($path) = @_; 3042 my ($path) = @_;
2813 3043
3044 # HACK to clear player env face cache, we need some signal framework
3045 # for this (global event?)
3046 %ext::player_env::MUSIC_FACE_CACHE = ();
3047
3048 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3049
2814 warn "loading facedata from $path\n"; 3050 warn "loading facedata from $path\n";
2815 3051
2816 my $facedata; 3052 my $facedata;
2817 0 < aio_load $path, $facedata 3053 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3054 or die "$path: $!";
2819 3055
2820 $facedata = Coro::Storable::thaw $facedata; 3056 $facedata = Coro::Storable::thaw $facedata;
2821 3057
2822 $facedata->{version} == 2 3058 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3059 or cf::cleanup "$path: version mismatch, cannot proceed.";
3060
3061 # patch in the exptable
3062 $facedata->{resource}{"res/exp_table"} = {
3063 type => FT_RSRC,
3064 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3065 };
3066 cf::cede_to_tick;
2824 3067
2825 { 3068 {
2826 my $faces = $facedata->{faceinfo}; 3069 my $faces = $facedata->{faceinfo};
2827 3070
2828 while (my ($face, $info) = each %$faces) { 3071 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3072 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 3073 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3074 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3075 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3076 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3077
2835 cf::cede_to_tick; 3078 cf::cede_to_tick;
2836 } 3079 }
2837 3080
2838 while (my ($face, $info) = each %$faces) { 3081 while (my ($face, $info) = each %$faces) {
… …
2863 3106
2864 { 3107 {
2865 # TODO: for gcfclient pleasure, we should give resources 3108 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3109 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3110 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3111
2870 my $soundconf = delete $res->{"res/sound.conf"}; 3112 my $soundconf = delete $res->{"res/sound.conf"};
2871 3113
2872 while (my ($name, $info) = each %$res) { 3114 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; 3115 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data;
2879 3117
2880 if ($info->{type} & 1) { 3118 if ($info->{type} & 1) {
2881 # prepend meta info 3119 # prepend meta info
2882 3120
3121 my $meta = $enc->encode ({
3122 name => $name,
3123 %{ $info->{meta} || {} },
3124 });
3125
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3126 $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 { 3127 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3128 $data = $info->{data};
2889 } 3129 }
2890 3130
3131 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 3132 cf::face::set_type $idx, $info->{type};
2892 3133
2893 cf::cede_to_tick; 3134 cf::cede_to_tick;
2894 } 3135 }
2895 3136
… …
2922 $ns->fx_want ($k, $v); 3163 $ns->fx_want ($k, $v);
2923 } 3164 }
2924}; 3165};
2925 3166
2926sub reload_regions { 3167sub reload_regions {
3168 # HACK to clear player env face cache, we need some signal framework
3169 # for this (global event?)
3170 %ext::player_env::MUSIC_FACE_CACHE = ();
3171
2927 load_resource_file "$MAPDIR/regions" 3172 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3173 or die "unable to load regions file\n";
2929 3174
2930 for (cf::region::list) { 3175 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3176 $_->{match} = qr/$_->{match}/
… …
2967 3212
2968sub init { 3213sub init {
2969 reload_resources; 3214 reload_resources;
2970} 3215}
2971 3216
2972sub cfg_load { 3217sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3218 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3219 or return;
2975 3220
2976 local $/; 3221 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3222 *CFG = YAML::Syck::Load <$fh>;
… …
2993sub main { 3238sub main {
2994 # we must not ever block the main coroutine 3239 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3240 local $Coro::idle = sub {
2996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2997 (async { 3242 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER";
2998 Event::one_event; 3244 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3245 })->prio (Coro::PRIO_MAX);
3000 }; 3246 };
3001 3247
3002 cfg_load; 3248 reload_config;
3003 db_init; 3249 db_init;
3004 load_extensions; 3250 load_extensions;
3005 3251
3006 $TICK_WATCHER->start; 3252 $TICK_WATCHER->start;
3007 Event::loop; 3253 Event::loop;
… …
3074 # and maps saved/destroyed asynchronously. 3320 # and maps saved/destroyed asynchronously.
3075 warn "begin emergency player save\n"; 3321 warn "begin emergency player save\n";
3076 for my $login (keys %cf::PLAYER) { 3322 for my $login (keys %cf::PLAYER) {
3077 my $pl = $cf::PLAYER{$login} or next; 3323 my $pl = $cf::PLAYER{$login} or next;
3078 $pl->valid or next; 3324 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079 $pl->save; 3326 $pl->save;
3080 } 3327 }
3081 warn "end emergency player save\n"; 3328 warn "end emergency player save\n";
3082 3329
3083 warn "begin emergency map save\n"; 3330 warn "begin emergency map save\n";
… …
3131 3378
3132 warn "flushing outstanding aio requests"; 3379 warn "flushing outstanding aio requests";
3133 for (;;) { 3380 for (;;) {
3134 BDB::flush; 3381 BDB::flush;
3135 IO::AIO::flush; 3382 IO::AIO::flush;
3136 Coro::cede; 3383 Coro::cede_notself;
3137 last unless IO::AIO::nreqs || BDB::nreqs; 3384 last unless IO::AIO::nreqs || BDB::nreqs;
3138 warn "iterate..."; 3385 warn "iterate...";
3139 } 3386 }
3140 3387
3141 ++$RELOAD; 3388 ++$RELOAD;
… …
3200 warn "reloading cf.pm"; 3447 warn "reloading cf.pm";
3201 require cf; 3448 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3450
3204 warn "loading config and database again"; 3451 warn "loading config and database again";
3205 cf::cfg_load; 3452 cf::reload_config;
3206 3453
3207 warn "loading extensions"; 3454 warn "loading extensions";
3208 cf::load_extensions; 3455 cf::load_extensions;
3209 3456
3210 warn "reattaching attachments to objects/players"; 3457 warn "reattaching attachments to objects/players";
… …
3246register_command "reload" => sub { 3493register_command "reload" => sub {
3247 my ($who, $arg) = @_; 3494 my ($who, $arg) = @_;
3248 3495
3249 if ($who->flag (FLAG_WIZ)) { 3496 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 3497 $who->message ("reloading server.");
3498 async {
3499 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 3500 reload_perl;
3501 };
3252 } 3502 }
3253}; 3503};
3254 3504
3255unshift @INC, $LIBDIR; 3505unshift @INC, $LIBDIR;
3256 3506
… …
3275 my $signal = new Coro::Signal; 3525 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3526 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3527 $signal->wait;
3278} 3528}
3279 3529
3280 my $min = 1e6;#d#
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer ( 3530$TICK_WATCHER = Event->timer (
3283 reentrant => 0, 3531 reentrant => 0,
3284 parked => 1, 3532 parked => 1,
3285 prio => 0, 3533 prio => 0,
3286 at => $NEXT_TICK || $TICK, 3534 at => $NEXT_TICK || $TICK,
… …
3294 3542
3295 $NOW = $tick_start = Event::time; 3543 $NOW = $tick_start = Event::time;
3296 3544
3297 cf::server_tick; # one server iteration 3545 cf::server_tick; # one server iteration
3298 3546
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; 3547 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK; 3548 $NEXT_TICK += $TICK;
3324 3549
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3550 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10; 3551 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool { 3552 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver";
3328 write_runtime 3554 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!"; 3555 or warn "ERROR: unable to write runtime file: $!";
3330 }; 3556 };
3331 } 3557 }
3332 3558
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3560 $sig->send;
3338 } 3561 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3562 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3563 $sig->send;
… …
3350 3573
3351 $LOAD = ($NOW - $tick_start) / $TICK; 3574 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3576
3354 _post_tick; 3577 _post_tick;
3355
3356
3357 }, 3578 },
3358); 3579);
3359 3580
3360{ 3581{
3582 BDB::min_parallel 8;
3361 BDB::max_poll_time $TICK * 0.1; 3583 BDB::max_poll_time $TICK * 0.1;
3362 $BDB_POLL_WATCHER = Event->io ( 3584 $BDB_POLL_WATCHER = Event->io (
3363 reentrant => 0, 3585 reentrant => 0,
3364 fd => BDB::poll_fileno, 3586 fd => BDB::poll_fileno,
3365 poll => 'r', 3587 poll => 'r',
3366 prio => 0, 3588 prio => 0,
3367 data => WF_AUTOCANCEL, 3589 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb, 3590 cb => \&BDB::poll_cb,
3369 ); 3591 );
3370 BDB::min_parallel 8;
3371 3592
3372 BDB::set_sync_prepare { 3593 BDB::set_sync_prepare {
3373 my $status; 3594 my $status;
3374 my $current = $Coro::current; 3595 my $current = $Coro::current;
3375 ( 3596 (
… …
3384 ) 3605 )
3385 }; 3606 };
3386 3607
3387 unless ($DB_ENV) { 3608 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 3609 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3611 | BDB::LOG_AUTOREMOVE, 1);
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 3614
3390 cf::sync_job { 3615 cf::sync_job {
3391 eval { 3616 eval {
3392 BDB::db_env_open 3617 BDB::db_env_open
3393 $DB_ENV, 3618 $DB_ENV,
… …
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3620 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3621 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3622 0666;
3398 3623
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3624 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 }; 3625 };
3404 3626
3405 cf::cleanup "db_env_open(db): $@" if $@; 3627 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3628 };
3407 } 3629 }
3630
3631 $BDB_DEADLOCK_WATCHER = Event->timer (
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 );
3641 $BDB_CHECKPOINT_WATCHER = Event->timer (
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 );
3651 $BDB_TRICKLE_WATCHER = Event->timer (
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 );
3408} 3661}
3409 3662
3410{ 3663{
3411 IO::AIO::min_parallel 8; 3664 IO::AIO::min_parallel 8;
3412 3665
… …
3415 $AIO_POLL_WATCHER = Event->io ( 3668 $AIO_POLL_WATCHER = Event->io (
3416 reentrant => 0, 3669 reentrant => 0,
3417 data => WF_AUTOCANCEL, 3670 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno, 3671 fd => IO::AIO::poll_fileno,
3419 poll => 'r', 3672 poll => 'r',
3420 prio => 6, 3673 prio => 0,
3421 cb => \&IO::AIO::poll_cb, 3674 cb => \&IO::AIO::poll_cb,
3422 ); 3675 );
3423} 3676}
3424 3677
3425my $_log_backtrace; 3678my $_log_backtrace;
… …
3431 3684
3432 # limit the # of concurrent backtraces 3685 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 3686 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace; 3687 ++$_log_backtrace;
3435 async { 3688 async {
3689 $Coro::current->{desc} = "abt $msg";
3690
3436 my @bt = fork_call { 3691 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 3692 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3693 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3694 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 3695 or die "addr2line: $!";

Diff Legend

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