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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.371 by root, Thu Sep 13 16:16:01 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
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 ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
79our $NEXT_TICK; 80our $NEXT_TICK;
80our $NOW; 81our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
82 83
83our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 88our $DB_ENV;
85 89
86our %CFG; 90our %CFG;
87 91
88our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 93our $RUNTIME;
90 94
91our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
94 98
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 101
186 $msg .= "\n" 190 $msg .= "\n"
187 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
188 192
189 $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;
190 194
191 utf8::encode $msg;
192 LOG llevError, $msg; 195 LOG llevError, $msg;
193 }; 196 };
194} 197}
195 198
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
274returned. 277returned.
275 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
276Lock 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
277uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
278 284
279=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
280 286
281Return 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.
282 288
283=cut 289=cut
284 290
285our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
286 293
287sub lock_wait($) { 294sub lock_wait($) {
288 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#
289 301
290 # wait for lock, if any 302 # wait for lock, if any
291 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 305 Coro::schedule;
299 311
300 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
301 lock_wait $key; 313 lock_wait $key;
302 314
303 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
304 317
305 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
308 } 322 }
309} 323}
310 324
322 }; 336 };
323 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
324 $guard 338 $guard
325} 339}
326 340
327=item cf::get_slot $time[, $priority] 341=item cf::get_slot $time[, $priority[, $name]]
328 342
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 343Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 344This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
332 349
333Useful for short background jobs. 350Useful for short background jobs.
334 351
335=cut 352=cut
336 353
363 Coro::schedule; 380 Coro::schedule;
364 } 381 }
365 } 382 }
366}; 383};
367 384
368sub get_slot($;$) { 385sub get_slot($;$$) {
369 my ($time, $pri) = @_; 386 my ($time, $pri, $name) = @_;
370 387
388 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal;
390
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 391 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 393 $SLOT_QUEUE->ready;
374 $sig->wait; 394 $sig->wait;
375} 395}
376 396
466Coro::Storable. May, of course, block. Note that the executed sub may 486Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 487never block itself or use any form of Event handling.
468 488
469=cut 489=cut
470 490
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 491sub fork_call(&@) {
481 my ($cb, @args) = @_; 492 my ($cb, @args) = @_;
482 493
483# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 494 # we seemingly have to make a local copy of the whole thing,
484# or die "socketpair: $!"; 495 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 496 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 497
488 if (my $pid = fork) { 498 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 499 reset_signals;
502 local $SIG{__WARN__}; 500 &$cb
503 local $SIG{__DIE__}; 501 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 502
510 eval { 503 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 504}
523 505
524=item $value = cf::db_get $family => $key 506=item $value = cf::db_get $family => $key
525 507
526Returns a single value from the environment database. 508Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
529 511
530Stores the given C<$value> in the family. It can currently store binary 512Stores the given C<$value> in the family. It can currently store binary
531data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
532 514
515=item $db = cf::db_table "name"
516
517Create and/or open a new database table. The string must not be "db" and must be unique
518within each server.
519
533=cut 520=cut
521
522sub db_table($) {
523 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV;
525
526 eval {
527 $db->set_flags (BDB::CHKSUM);
528
529 utf8::encode $name;
530 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
531 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
532 cf::cleanup "db_open(db): $!" if $!;
533 };
534 cf::cleanup "db_open(db): $@" if $@;
535
536 $db
537}
534 538
535our $DB; 539our $DB;
536 540
537sub db_init { 541sub db_init {
538 unless ($DB) {
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job { 542 cf::sync_job {
542 eval { 543 $DB ||= db_table "db";
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 } 544 };
552} 545}
553 546
554sub db_get($$) { 547sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
556 549
606 if (1) { 599 if (1) {
607 $md5 = 600 $md5 =
608 join "\x00", 601 join "\x00",
609 $processversion, 602 $processversion,
610 map { 603 map {
611 Coro::cede; 604 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 605 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 606 } 0.. $#$src;
614 607
615 608
616 my $dbmd5 = db_get cache => "$id/md5"; 609 my $dbmd5 = db_get cache => "$id/md5";
1033); 1026);
1034 1027
1035sub object_freezer_save { 1028sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1037 1030
1031 my $guard = cf::lock_acquire "io";
1032
1038 sync_job { 1033 sync_job {
1039 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
1042 1038
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
1065 } 1061 }
1066 } else { 1062 } else {
1067 aio_unlink $filename; 1063 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
1069 } 1065 }
1070 } 1066 };
1067
1068 undef $guard;
1071} 1069}
1072 1070
1073sub object_freezer_as_string { 1071sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
1075 1073
1080 1078
1081sub object_thawer_load { 1079sub object_thawer_load {
1082 my ($filename) = @_; 1080 my ($filename) = @_;
1083 1081
1084 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1085
1086 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
1087 or return; 1087 or return;
1088 1088
1089 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1091 or return;
1092
1093 undef $guard;
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
1093 } 1095 }
1094 1096
1097 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1097 return ($data, $av); 1101 ($data, $av)
1098} 1102}
1099 1103
1100=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1101 1105
1102=over 4 1106=over 4
1175 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
1176 1180
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1182
1179 if (ref $msg) { 1183 if (ref $msg) {
1184 my ($type, $reply, @payload) =
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188
1189 my @reply;
1190
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1185 } else { 1198 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1200 }
1188 1201
1189 cf::override; 1202 cf::override;
1279 1292
1280=head3 cf::player 1293=head3 cf::player
1281 1294
1282=over 4 1295=over 4
1283 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1284=item cf::player::find $login 1311=item cf::player::find $login
1285 1312
1286Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1287 1314
1288=cut 1315=cut
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1354
1328 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1329 or return; 1356 or return;
1357
1358 $f->next;
1359 my $pl = cf::player::load_pl $f
1360 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs;
1330 $cf::PLAYER{$login} = $pl 1363 $cf::PLAYER{$login} = $pl
1331 } 1364 }
1332 } 1365 }
1333} 1366}
1334 1367
1344 1377
1345 aio_mkdir playerdir $pl, 0770; 1378 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1379 $pl->{last_save} = $cf::RUNTIME;
1347 1380
1348 $pl->save_pl ($path); 1381 $pl->save_pl ($path);
1349 Coro::cede; 1382 cf::cede_to_tick;
1350} 1383}
1351 1384
1352sub new($) { 1385sub new($) {
1353 my ($login) = @_; 1386 my ($login) = @_;
1354 1387
1358 $self->{deny_save} = 1; 1391 $self->{deny_save} = 1;
1359 1392
1360 $cf::PLAYER{$login} = $self; 1393 $cf::PLAYER{$login} = $self;
1361 1394
1362 $self 1395 $self
1396}
1397
1398=item $player->send_msg ($channel, $msg, $color, [extra...])
1399
1400=cut
1401
1402sub send_msg {
1403 my $ns = shift->ns
1404 or return;
1405 $ns->send_msg (@_);
1363} 1406}
1364 1407
1365=item $pl->quit_character 1408=item $pl->quit_character
1366 1409
1367Nukes the player without looking back. If logged in, the connection will 1410Nukes the player without looking back. If logged in, the connection will
1422 or return []; 1465 or return [];
1423 1466
1424 my @logins; 1467 my @logins;
1425 1468
1426 for my $login (@$dirs) { 1469 for my $login (@$dirs) {
1470 my $path = path $login;
1471
1472 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1475 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1476 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 }
1430 1478
1431 utf8::decode $login; 1479 utf8::decode $login;
1432 push @logins, $login; 1480 push @logins, $login;
1433 } 1481 }
1434 1482
1472sub expand_cfpod { 1520sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1521 ((my $self), (local $_)) = @_;
1474 1522
1475 # escape & and < 1523 # escape & and <
1476 s/&/&amp;/g; 1524 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g; 1525 s/(?<![BIUGHT])</&lt;/g;
1478 1526
1479 # this is buggy, it needs to properly take care of nested <'s 1527 # this is buggy, it needs to properly take care of nested <'s
1480 1528
1481 1 while 1529 1 while
1482 # replace B<>, I<>, U<> etc. 1530 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1531 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486 # replace G<male|female> tags 1535 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1536 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1 1537 $self->gender ? $2 : $1
1489 }ge 1538 }ge
1490 # replace H<hint text> 1539 # replace H<hint text>
1511sub hintmode { 1560sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1561 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1562 $_[0]{hintmode}
1514} 1563}
1515 1564
1516=item $player->ext_reply ($msgid, %msg) 1565=item $player->ext_reply ($msgid, @msg)
1517 1566
1518Sends an ext reply to the player. 1567Sends an ext reply to the player.
1519 1568
1520=cut 1569=cut
1521 1570
1522sub ext_reply($$%) { 1571sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1572 my ($self, $id, @msg) = @_;
1524 1573
1525 $msg{msgid} = $id; 1574 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1575}
1528 1576
1529=item $player->ext_event ($type, %msg) 1577=item $player->ext_msg ($type, @msg)
1530 1578
1531Sends an ext event to the client. 1579Sends an ext event to the client.
1532 1580
1533=cut 1581=cut
1534 1582
1535sub ext_event($$%) { 1583sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1584 my ($self, $type, @msg) = @_;
1537 1585
1538 $self->ns->ext_event ($type, %msg); 1586 $self->ns->ext_msg ($type, @msg);
1539} 1587}
1540 1588
1541=head3 cf::region 1589=head3 cf::region
1542 1590
1543=over 4 1591=over 4
1759 1807
1760sub load_header_from($) { 1808sub load_header_from($) {
1761 my ($self, $path) = @_; 1809 my ($self, $path) = @_;
1762 1810
1763 utf8::encode $path; 1811 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 1812 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 1813 or return;
1814
1815 $self->_load_header ($f)
1816 or return;
1817
1818 local $MAP_LOADING{$self->{path}} = $self;
1819 $f->resolve_delayed_derefs;
1769 1820
1770 $self->{load_path} = $path; 1821 $self->{load_path} = $path;
1771 1822
1772 1 1823 1
1773} 1824}
1827sub find { 1878sub find {
1828 my ($path, $origin) = @_; 1879 my ($path, $origin) = @_;
1829 1880
1830 $path = normalise $path, $origin && $origin->path; 1881 $path = normalise $path, $origin && $origin->path;
1831 1882
1883 cf::lock_wait "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 1884 cf::lock_wait "map_find:$path";
1833 1885
1834 $cf::MAP{$path} || do { 1886 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path"; 1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1889
1836 my $map = new_from_path cf::map $path 1890 my $map = new_from_path cf::map $path
1837 or return; 1891 or return;
1838 1892
1839 $map->{last_save} = $cf::RUNTIME; 1893 $map->{last_save} = $cf::RUNTIME;
1840 1894
1842 or return; 1896 or return;
1843 1897
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 1899 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 1900 #$cf::WAIT_FOR_TICK->wait;
1901 undef $guard1;
1902 undef $guard2;
1847 $map->reset; 1903 $map->reset;
1848 undef $guard;
1849 return find $path; 1904 return find $path;
1850 } 1905 }
1851 1906
1852 $cf::MAP{$path} = $map 1907 $cf::MAP{$path} = $map
1853 } 1908 }
1862 local $self->{deny_reset} = 1; # loading can take a long time 1917 local $self->{deny_reset} = 1; # loading can take a long time
1863 1918
1864 my $path = $self->{path}; 1919 my $path = $self->{path};
1865 1920
1866 { 1921 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 1922 my $guard = cf::lock_acquire "map_data:$path";
1868 1923
1924 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1925 return unless $self->in_memory == cf::MAP_SWAPPED;
1870 1926
1871 $self->in_memory (cf::MAP_LOADING); 1927 $self->in_memory (cf::MAP_LOADING);
1872 1928
1873 $self->alloc; 1929 $self->alloc;
1874 1930
1875 $self->pre_load; 1931 $self->pre_load;
1876 Coro::cede; 1932 cf::cede_to_tick;
1877 1933
1934 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block;
1878 $self->_load_objects ($self->{load_path}, 1) 1936 $self->_load_objects ($f)
1879 or return; 1937 or return;
1880 1938
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1882 if delete $self->{load_original}; 1940 if delete $self->{load_original};
1883 1941
1884 if (my $uniq = $self->uniq_path) { 1942 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 1943 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 1944 unless (aio_stat $uniq) {
1945 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 1946 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1947 $self->_load_objects ($f);
1948 $f->resolve_delayed_derefs;
1949 }
1889 } 1950 }
1890 } 1951 }
1891 1952
1892 Coro::cede; 1953 $f->resolve_delayed_derefs;
1954
1955 cf::cede_to_tick;
1893 # now do the right thing for maps 1956 # now do the right thing for maps
1894 $self->link_multipart_objects; 1957 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1958 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1959 unless $self->difficulty;
1897 Coro::cede; 1960 cf::cede_to_tick;
1898 1961
1899 unless ($self->{deny_activate}) { 1962 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1963 $self->decay_objects;
1901 $self->fix_auto_apply; 1964 $self->fix_auto_apply;
1902 $self->update_buttons; 1965 $self->update_buttons;
1903 Coro::cede; 1966 cf::cede_to_tick;
1904 $self->set_darkness_map; 1967 $self->set_darkness_map;
1905 Coro::cede; 1968 cf::cede_to_tick;
1906 $self->activate; 1969 $self->activate;
1907 } 1970 }
1971
1972 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME);
1908 1974
1909 $self->in_memory (cf::MAP_IN_MEMORY); 1975 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 1976 }
1911 1977
1912 $self->post_load; 1978 $self->post_load;
1923 1989
1924 $self 1990 $self
1925} 1991}
1926 1992
1927# find and load all maps in the 3x3 area around a map 1993# find and load all maps in the 3x3 area around a map
1928sub load_diag { 1994sub load_neighbours {
1929 my ($map) = @_; 1995 my ($map) = @_;
1930 1996
1931 my @diag; # diagonal neighbours 1997 my @neigh; # diagonal neighbours
1932 1998
1933 for (0 .. 3) { 1999 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2000 my $neigh = $map->tile_path ($_)
1935 or next; 2001 or next;
1936 $neigh = find $neigh, $map 2002 $neigh = find $neigh, $map
1937 or next; 2003 or next;
1938 $neigh->load; 2004 $neigh->load;
1939 2005
2006 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2007 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2008 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2009 }
1943 2010
1944 for (@diag) { 2011 for (grep defined $_->[0], @neigh) {
2012 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2013 my $neigh = find $path, $origin
1946 or next; 2014 or next;
1947 $neigh->load; 2015 $neigh->load;
1948 } 2016 }
1949} 2017}
1950 2018
1955} 2023}
1956 2024
1957sub do_load_sync { 2025sub do_load_sync {
1958 my ($map) = @_; 2026 my ($map) = @_;
1959 2027
2028 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2029 if $Coro::current == $Coro::main;
2030
1960 cf::sync_job { $map->load }; 2031 cf::sync_job { $map->load };
1961} 2032}
1962 2033
1963our %MAP_PREFETCH; 2034our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2035our $MAP_PREFETCHER = undef;
1965 2036
1966sub find_async { 2037sub find_async {
1967 my ($path, $origin) = @_; 2038 my ($path, $origin, $load) = @_;
1968 2039
1969 $path = normalise $path, $origin && $origin->{path}; 2040 $path = normalise $path, $origin && $origin->{path};
1970 2041
1971 if (my $map = $cf::MAP{$path}) { 2042 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 2044 }
1974 2045
1975 undef $MAP_PREFETCH{$path}; 2046 $MAP_PREFETCH{$path} |= $load;
2047
1976 $MAP_PREFETCHER ||= cf::async { 2048 $MAP_PREFETCHER ||= cf::async {
1977 while (%MAP_PREFETCH) { 2049 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2050 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2051 if (my $map = find $k) {
1980 $map->load; 2052 $map->load if $v;
1981 } 2053 }
1982 2054
1983 delete $MAP_PREFETCH{$path}; 2055 delete $MAP_PREFETCH{$k};
1984 } 2056 }
1985 } 2057 }
1986 undef $MAP_PREFETCHER; 2058 undef $MAP_PREFETCHER;
1987 }; 2059 };
1988 $MAP_PREFETCHER->prio (6); 2060 $MAP_PREFETCHER->prio (6);
1991} 2063}
1992 2064
1993sub save { 2065sub save {
1994 my ($self) = @_; 2066 my ($self) = @_;
1995 2067
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2069
1998 $self->{last_save} = $cf::RUNTIME; 2070 $self->{last_save} = $cf::RUNTIME;
1999 2071
2000 return unless $self->dirty; 2072 return unless $self->dirty;
2001 2073
2024 my ($self) = @_; 2096 my ($self) = @_;
2025 2097
2026 # save first because save cedes 2098 # save first because save cedes
2027 $self->save; 2099 $self->save;
2028 2100
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2101 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2102
2031 return if $self->players; 2103 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2105 return if $self->{deny_save};
2034 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2111 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2112}
2038 2113
2039sub reset_at { 2114sub reset_at {
2040 my ($self) = @_; 2115 my ($self) = @_;
2041 2116
2073 if $uniq; 2148 if $uniq;
2074 } 2149 }
2075 2150
2076 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
2077 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2155 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2156
2082 $self->unlink_save; 2157 $self->unlink_save;
2083 $self->destroy; 2158 $self->destroy;
2084} 2159}
2085 2160
2086my $nuke_counter = "aaaa"; 2161my $nuke_counter = "aaaa";
2087 2162
2088sub nuke { 2163sub nuke {
2089 my ($self) = @_; 2164 my ($self) = @_;
2090 2165
2166 {
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168
2091 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
2092 2170
2093 $self->unlink_save; 2171 $self->unlink_save;
2094 2172
2095 bless $self, "cf::map"; 2173 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2178
2101 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2180 }
2102 2181
2103 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
2104} 2183}
2105 2184
2106=item $maps = cf::map::tmp_maps 2185=item $maps = cf::map::tmp_maps
2182 2261
2183sub inv_recursive { 2262sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2185} 2264}
2186 2265
2266=item $ref = $ob->ref
2267
2268creates and returns a persistent reference to an objetc that can be stored as a string.
2269
2270=item $ob = cf::object::deref ($refstring)
2271
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block.
2274
2275=cut
2276
2277sub deref {
2278 my ($ref) = @_;
2279
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return;
2287 $pl->ob->uuid eq $uuid
2288 or return;
2289
2290 $pl->ob
2291 } else {
2292 warn "$ref: cannot resolve object reference\n";
2293 undef
2294 }
2295}
2296
2187package cf; 2297package cf;
2188 2298
2189=back 2299=back
2190 2300
2191=head3 cf::object::player 2301=head3 cf::object::player
2213 2323
2214 } else { 2324 } else {
2215 my $pl = $self->contr; 2325 my $pl = $self->contr;
2216 2326
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2327 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2328 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2329 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2330
2226 } else { 2331 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2332 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2333 $self->message ($msg, $flags);
2229 } 2334 }
2230 } 2335 }
2336}
2337
2338=item $object->send_msg ($channel, $msg, $color, [extra...])
2339
2340=cut
2341
2342sub cf::object::send_msg {
2343 my $pl = shift->contr
2344 or return;
2345 $pl->send_msg (@_);
2231} 2346}
2232 2347
2233=item $player_object->may ("access") 2348=item $player_object->may ("access")
2234 2349
2235Returns wether the given player is authorized to access resource "access" 2350Returns wether the given player is authorized to access resource "access"
2314 # use -1 or undef as default coordinates, not 0, 0 2429 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2430 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2431 if $x <=0 && $y <= 0;
2317 2432
2318 $map->load; 2433 $map->load;
2319 $map->load_diag; 2434 $map->load_neighbours;
2320 2435
2321 return unless $self->contr->active; 2436 return unless $self->contr->active;
2322 $self->activate_recursive; 2437 $self->activate_recursive;
2323 2438
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2460
2346 $self->enter_link; 2461 $self->enter_link;
2347 2462
2348 (async { 2463 (async {
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
2349 my $map = eval { 2483 my $map = eval {
2350 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2351 2485
2352 if ($map) { 2486 if ($map) {
2353 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2355 } else { 2489 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2491 }
2358 2492
2359 $map 2493 $map
2360 }; 2494 };
2361 2495
2495the message, with C<log> being the default. If C<$color> is negative, suppress 2629the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 2630the message unless the client supports the msg packet.
2497 2631
2498=cut 2632=cut
2499 2633
2634our %CHANNEL = (
2635 "c/identify" => {
2636 id => "identify",
2637 title => "Identify",
2638 reply => undef,
2639 tooltip => "Items recently identified",
2640 },
2641 "c/examine" => {
2642 id => "examine",
2643 title => "Examine",
2644 reply => undef,
2645 tooltip => "Signs and other items you examined",
2646 },
2647);
2648
2500sub cf::client::send_msg { 2649sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2650 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2651
2503 $msg = $self->pl->expand_cfpod ($msg); 2652 $msg = $self->pl->expand_cfpod ($msg);
2504 2653
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 2654 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655
2656 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2506 2658
2507 if (ref $channel) { 2659 if (ref $channel) {
2508 # send meta info to client, if not yet sent 2660 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2661 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2662 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2663 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg;
2512 } 2665 }
2513 2666
2514 $channel = $channel->{id}; 2667 $channel = $channel->{id};
2515 } 2668 }
2516 2669
2517 return unless @extra || length $msg; 2670 return unless @extra || length $msg;
2518 2671
2519 if ($self->can_msg) { 2672 if ($self->can_msg) {
2673 # default colour, mask it out
2674 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2675 if $color & cf::NDI_DEF;
2676
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2677 $self->send_packet ("msg " . $self->{json_coder}->encode (
2678 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2679 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 if ($color >= 0) { 2680 if ($color >= 0) {
2681 # replace some tags by gcfclient-compatible ones
2682 for ($msg) {
2683 1 while
2684 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2685 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2686 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2687 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2688 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2689 }
2690
2691 $color &= cf::NDI_COLOR_MASK;
2692
2693 utf8::encode $msg;
2694
2533 if (0 && $msg =~ /\[/) { 2695 if (0 && $msg =~ /\[/) {
2696 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2697 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2698 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2699 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2700 $self->send_packet ("drawinfo $color $msg")
2538 } 2701 }
2539 } 2702 }
2540 } 2703 }
2541} 2704}
2542 2705
2543=item $client->ext_event ($type, %msg) 2706=item $client->ext_msg ($type, @msg)
2544 2707
2545Sends an ext event to the client. 2708Sends an ext event to the client.
2546 2709
2547=cut 2710=cut
2548 2711
2549sub cf::client::ext_event($$%) { 2712sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2713 my ($self, $type, @msg) = @_;
2551 2714
2552 return unless $self->extcmd; 2715 if ($self->extcmd == 2) {
2553 2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2717 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2718 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2719 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2720 }
2721}
2722
2723=item $client->ext_reply ($msgid, @msg)
2724
2725Sends an ext reply to the client.
2726
2727=cut
2728
2729sub cf::client::ext_reply($$@) {
2730 my ($self, $id, @msg) = @_;
2731
2732 if ($self->extcmd == 2) {
2733 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2734 } elsif ($self->extcmd == 1) {
2735 #TODO: version 1, remove
2736 unshift @msg, msgtype => "reply", msgid => $id;
2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2738 }
2556} 2739}
2557 2740
2558=item $success = $client->query ($flags, "text", \&cb) 2741=item $success = $client->query ($flags, "text", \&cb)
2559 2742
2560Queues a query to the client, calling the given callback with 2743Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 2798 my ($ns, $buf) = @_;
2616 2799
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2800 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2801
2619 if (ref $msg) { 2802 if (ref $msg) {
2803 my ($type, $reply, @payload) =
2804 "ARRAY" eq ref $msg
2805 ? @$msg
2806 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2807
2808 my @reply;
2809
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2810 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2811 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2812 }
2813
2814 $ns->ext_reply ($reply, @reply)
2815 if $reply;
2816
2626 } else { 2817 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2818 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 2819 }
2629 2820
2630 cf::override; 2821 cf::override;
2677our $safe = new Safe "safe"; 2868our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2869our $safe_hole = new Safe::Hole;
2679 2870
2680$SIG{FPE} = 'IGNORE'; 2871$SIG{FPE} = 'IGNORE';
2681 2872
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2873$safe->permit_only (Opcode::opset qw(
2874 :base_core :base_mem :base_orig :base_math
2875 grepstart grepwhile mapstart mapwhile
2876 sort time
2877));
2683 2878
2684# here we export the classes and methods available to script code 2879# here we export the classes and methods available to script code
2685 2880
2686=pod 2881=pod
2687 2882
2688The following functions and methods are available within a safe environment: 2883The following functions and methods are available within a safe environment:
2689 2884
2690 cf::object 2885 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 2886 contr pay_amount pay_player map x y force_find force_add
2692 insert remove 2887 insert remove name archname title slaying race decrease_ob_nr
2693 2888
2694 cf::object::player 2889 cf::object::player
2695 player 2890 player
2696 2891
2697 cf::player 2892 cf::player
2702 2897
2703=cut 2898=cut
2704 2899
2705for ( 2900for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race
2707 insert remove)], 2903 decrease_ob_nr)],
2708 ["cf::object::player" => qw(player)], 2904 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2905 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2906 ["cf::map" => qw(trigger)],
2711) { 2907) {
2712 no strict 'refs'; 2908 no strict 'refs';
2788# the server's init and main functions 2984# the server's init and main functions
2789 2985
2790sub load_facedata($) { 2986sub load_facedata($) {
2791 my ($path) = @_; 2987 my ($path) = @_;
2792 2988
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2993 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2994
2793 warn "loading facedata from $path\n"; 2995 warn "loading facedata from $path\n";
2794 2996
2795 my $facedata; 2997 my $facedata;
2796 0 < aio_load $path, $facedata 2998 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 2999 or die "$path: $!";
2798 3000
2799 $facedata = Coro::Storable::thaw $facedata; 3001 $facedata = Coro::Storable::thaw $facedata;
2800 3002
2801 $facedata->{version} == 2 3003 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3004 or cf::cleanup "$path: version mismatch, cannot proceed.";
3005
3006 # patch in the exptable
3007 $facedata->{resource}{"res/exp_table"} = {
3008 type => FT_RSRC,
3009 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3010 };
3011 cf::cede_to_tick;
2803 3012
2804 { 3013 {
2805 my $faces = $facedata->{faceinfo}; 3014 my $faces = $facedata->{faceinfo};
2806 3015
2807 while (my ($face, $info) = each %$faces) { 3016 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3017 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 3018 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3019 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 3022
2814 cf::cede_to_tick; 3023 cf::cede_to_tick;
2815 } 3024 }
2816 3025
2817 while (my ($face, $info) = each %$faces) { 3026 while (my ($face, $info) = each %$faces) {
2842 3051
2843 { 3052 {
2844 # TODO: for gcfclient pleasure, we should give resources 3053 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 3054 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3055 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 3056
3057 my $soundconf = delete $res->{"res/sound.conf"};
2848 3058
2849 while (my ($name, $info) = each %$res) { 3059 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3060 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
2857 3062
2858 if ($name =~ /\.jpg$/) { 3063 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3064 # prepend meta info
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3065
3066 my $meta = $enc->encode ({
3067 name => $name,
3068 %{ $info->{meta} || {} },
3069 });
3070
3071 $data = pack "(w/a*)*", $meta, $info->{data};
2861 } else { 3072 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3073 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3074 }
2868 3075
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
2869 cf::cede_to_tick; 3079 cf::cede_to_tick;
2870 } 3080 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
2871 } 3099 }
2872 3100
2873 1 3101 1
2874} 3102}
2875 3103
3104register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_;
3106
3107 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v);
3109 }
3110};
3111
2876sub reload_regions { 3112sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = ();
3116
2877 load_resource_file "$MAPDIR/regions" 3117 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3118 or die "unable to load regions file\n";
2879 3119
2880 for (cf::region::list) { 3120 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3121 $_->{match} = qr/$_->{match}/
2917 3157
2918sub init { 3158sub init {
2919 reload_resources; 3159 reload_resources;
2920} 3160}
2921 3161
2922sub cfg_load { 3162sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3163 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3164 or return;
2925 3165
2926 local $/; 3166 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3167 *CFG = YAML::Syck::Load <$fh>;
2947 (async { 3187 (async {
2948 Event::one_event; 3188 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3189 })->prio (Coro::PRIO_MAX);
2950 }; 3190 };
2951 3191
2952 cfg_load; 3192 reload_config;
2953 db_init; 3193 db_init;
2954 load_extensions; 3194 load_extensions;
2955 3195
2956 $TICK_WATCHER->start; 3196 $TICK_WATCHER->start;
2957 Event::loop; 3197 Event::loop;
3150 warn "reloading cf.pm"; 3390 warn "reloading cf.pm";
3151 require cf; 3391 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3393
3154 warn "loading config and database again"; 3394 warn "loading config and database again";
3155 cf::cfg_load; 3395 cf::reload_config;
3156 3396
3157 warn "loading extensions"; 3397 warn "loading extensions";
3158 cf::load_extensions; 3398 cf::load_extensions;
3159 3399
3160 warn "reattaching attachments to objects/players"; 3400 warn "reattaching attachments to objects/players";
3225 my $signal = new Coro::Signal; 3465 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 3466 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 3467 $signal->wait;
3228} 3468}
3229 3469
3230 my $min = 1e6;#d#
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer ( 3470$TICK_WATCHER = Event->timer (
3233 reentrant => 0, 3471 reentrant => 0,
3234 parked => 1, 3472 parked => 1,
3235 prio => 0, 3473 prio => 0,
3236 at => $NEXT_TICK || $TICK, 3474 at => $NEXT_TICK || $TICK,
3244 3482
3245 $NOW = $tick_start = Event::time; 3483 $NOW = $tick_start = Event::time;
3246 3484
3247 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
3248 3486
3249 0 && sync_job {#d#
3250 for(1..10) {
3251 my $t = Event::time;
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253 or die;
3254
3255 $map->width (50);
3256 $map->height (50);
3257 $map->alloc;
3258 $map->_load_objects ("/tmp/x.map", 1);
3259 my $t = Event::time - $t;
3260
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 };
3271
3272 $RUNTIME += $TICK; 3487 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK; 3488 $NEXT_TICK += $TICK;
3274 3489
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3490 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10; 3491 $NEXT_RUNTIME_WRITE = $NOW + 10;
3278 write_runtime 3493 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!"; 3494 or warn "ERROR: unable to write runtime file: $!";
3280 }; 3495 };
3281 } 3496 }
3282 3497
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 3499 $sig->send;
3288 } 3500 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 3501 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 3502 $sig->send;
3300 3512
3301 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 3515
3304 _post_tick; 3516 _post_tick;
3305
3306
3307 }, 3517 },
3308); 3518);
3309 3519
3310{ 3520{
3521 BDB::min_parallel 8;
3311 BDB::max_poll_time $TICK * 0.1; 3522 BDB::max_poll_time $TICK * 0.1;
3312 $BDB_POLL_WATCHER = Event->io ( 3523 $BDB_POLL_WATCHER = Event->io (
3313 reentrant => 0, 3524 reentrant => 0,
3314 fd => BDB::poll_fileno, 3525 fd => BDB::poll_fileno,
3315 poll => 'r', 3526 poll => 'r',
3316 prio => 0, 3527 prio => 0,
3317 data => WF_AUTOCANCEL, 3528 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb, 3529 cb => \&BDB::poll_cb,
3319 ); 3530 );
3320 BDB::min_parallel 8;
3321 3531
3322 BDB::set_sync_prepare { 3532 BDB::set_sync_prepare {
3323 my $status; 3533 my $status;
3324 my $current = $Coro::current; 3534 my $current = $Coro::current;
3325 ( 3535 (
3334 ) 3544 )
3335 }; 3545 };
3336 3546
3337 unless ($DB_ENV) { 3547 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 3548 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3550 | BDB::LOG_AUTOREMOVE, 1);
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 3553
3340 cf::sync_job { 3554 cf::sync_job {
3341 eval { 3555 eval {
3342 BDB::db_env_open 3556 BDB::db_env_open
3343 $DB_ENV, 3557 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 3561 0666;
3348 3562
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 3564 };
3354 3565
3355 cf::cleanup "db_env_open(db): $@" if $@; 3566 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 3567 };
3357 } 3568 }
3569
3570 $BDB_DEADLOCK_WATCHER = Event->timer (
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 );
3580 $BDB_CHECKPOINT_WATCHER = Event->timer (
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 );
3590 $BDB_TRICKLE_WATCHER = Event->timer (
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 );
3358} 3600}
3359 3601
3360{ 3602{
3361 IO::AIO::min_parallel 8; 3603 IO::AIO::min_parallel 8;
3362 3604

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines