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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines