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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.362 by root, Mon Sep 10 12:44:06 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 ();
… …
86our %CFG; 87our %CFG;
87 88
88our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 90our $RUNTIME;
90 91
91our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
94 95
95# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 98
… …
186 $msg .= "\n" 187 $msg .= "\n"
187 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
188 189
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 191
191 utf8::encode $msg;
192 LOG llevError, $msg; 192 LOG llevError, $msg;
193 }; 193 };
194} 194}
195 195
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
271Wait until the given lock is available and then acquires it and returns 271Wait 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, 272a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 273for example when the coroutine gets canceled), the lock is automatically
274returned. 274returned.
275 275
276Locks are *not* recursive, locking from the same coro twice results in a
277deadlocked coro.
278
276Lock names should begin with a unique identifier (for example, cf::map::find 279Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 280uses map_find and cf::map::load uses map_load).
278 281
279=item $locked = cf::lock_active $string 282=item $locked = cf::lock_active $string
280 283
281Return true if the lock is currently active, i.e. somebody has locked it. 284Return true if the lock is currently active, i.e. somebody has locked it.
282 285
283=cut 286=cut
284 287
285our %LOCK; 288our %LOCK;
289our %LOCKER;#d#
286 290
287sub lock_wait($) { 291sub lock_wait($) {
288 my ($key) = @_; 292 my ($key) = @_;
293
294 if ($LOCKER{$key} == $Coro::current) {#d#
295 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
296 return;#d#
297 }#d#
289 298
290 # wait for lock, if any 299 # wait for lock, if any
291 while ($LOCK{$key}) { 300 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 301 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 302 Coro::schedule;
… …
299 308
300 # wait, to be sure we are not locked 309 # wait, to be sure we are not locked
301 lock_wait $key; 310 lock_wait $key;
302 311
303 $LOCK{$key} = []; 312 $LOCK{$key} = [];
313 $LOCKER{$key} = $Coro::current;#d#
304 314
305 Coro::guard { 315 Coro::guard {
316 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 317 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 318 $_->ready for @{ delete $LOCK{$key} };
308 } 319 }
309} 320}
310 321
… …
320 my $guard = Coro::guard { 331 my $guard = Coro::guard {
321 $TICK_WATCHER->start; 332 $TICK_WATCHER->start;
322 }; 333 };
323 $TICK_WATCHER->stop; 334 $TICK_WATCHER->stop;
324 $guard 335 $guard
336}
337
338=item cf::get_slot $time[, $priority[, $name]]
339
340Allocate $time seconds of blocking CPU time at priority C<$priority>:
341This call blocks and returns only when you have at least C<$time> seconds
342of cpu time till the next tick. The slot is only valid till the next cede.
343
344The optional C<$name> can be used to identify the job to run. It might be
345used for statistical purposes and should identify the same time-class.
346
347Useful for short background jobs.
348
349=cut
350
351our @SLOT_QUEUE;
352our $SLOT_QUEUE;
353
354$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async {
356 my $signal = new Coro::Signal;
357
358 while () {
359 next_job:
360 my $avail = cf::till_tick;
361 if ($avail > 0.01) {
362 for (0 .. $#SLOT_QUEUE) {
363 if ($SLOT_QUEUE[$_][0] < $avail) {
364 my $job = splice @SLOT_QUEUE, $_, 1, ();
365 $job->[2]->send;
366 Coro::cede;
367 goto next_job;
368 }
369 }
370 }
371
372 if (@SLOT_QUEUE) {
373 # we do not use wait_For_tick() as it returns immediately when tick is inactive
374 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait;
376 } else {
377 Coro::schedule;
378 }
379 }
380};
381
382sub get_slot($;$$) {
383 my ($time, $pri, $name) = @_;
384
385 $time = $TICK * .6 if $time > $TICK * .6;
386 my $sig = new Coro::Signal;
387
388 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
389 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
390 $SLOT_QUEUE->ready;
391 $sig->wait;
325} 392}
326 393
327=item cf::async { BLOCK } 394=item cf::async { BLOCK }
328 395
329Currently the same as Coro::async_pool, meaning you cannot use 396Currently the same as Coro::async_pool, meaning you cannot use
… …
416Coro::Storable. May, of course, block. Note that the executed sub may 483Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 484never block itself or use any form of Event handling.
418 485
419=cut 486=cut
420 487
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 488sub fork_call(&@) {
431 my ($cb, @args) = @_; 489 my ($cb, @args) = @_;
432 490
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 491 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 492 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 493 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 494
438 if (my $pid = fork) { 495 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 496 reset_signals;
452 local $SIG{__WARN__}; 497 &$cb
453 local $SIG{__DIE__}; 498 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 499
460 eval { 500 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 501}
473 502
474=item $value = cf::db_get $family => $key 503=item $value = cf::db_get $family => $key
475 504
476Returns a single value from the environment database. 505Returns a single value from the environment database.
… …
556 if (1) { 585 if (1) {
557 $md5 = 586 $md5 =
558 join "\x00", 587 join "\x00",
559 $processversion, 588 $processversion,
560 map { 589 map {
561 Coro::cede; 590 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 591 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 592 } 0.. $#$src;
564 593
565 594
566 my $dbmd5 = db_get cache => "$id/md5"; 595 my $dbmd5 = db_get cache => "$id/md5";
… …
983); 1012);
984 1013
985sub object_freezer_save { 1014sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1015 my ($filename, $rdata, $objs) = @_;
987 1016
1017 my $guard = cf::lock_acquire "io";
1018
988 sync_job { 1019 sync_job {
989 if (length $$rdata) { 1020 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename);
990 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1023 $decname, length $$rdata, scalar @$objs;
992 1024
993 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994 chmod SAVE_MODE, $fh; 1026 chmod SAVE_MODE, $fh;
995 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996 aio_fsync $fh if $cf::USE_FSYNC; 1028 aio_fsync $fh if $cf::USE_FSYNC;
… …
1015 } 1047 }
1016 } else { 1048 } else {
1017 aio_unlink $filename; 1049 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1019 } 1051 }
1020 } 1052 };
1053
1054 undef $guard;
1021} 1055}
1022 1056
1023sub object_freezer_as_string { 1057sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1025 1059
… …
1030 1064
1031sub object_thawer_load { 1065sub object_thawer_load {
1032 my ($filename) = @_; 1066 my ($filename) = @_;
1033 1067
1034 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1035 1071
1036 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1037 or return; 1073 or return;
1038 1074
1039 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1077 or return;
1078
1079 undef $guard;
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1043 } 1081 }
1044 1082
1083 utf8::decode (my $decname = $filename);
1045 warn sprintf "loading %s (%d)\n", 1084 warn sprintf "loading %s (%d,%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1085 $decname, length $data, scalar @{$av || []};
1086
1047 return ($data, $av); 1087 ($data, $av)
1048} 1088}
1049 1089
1050=head2 COMMAND CALLBACKS 1090=head2 COMMAND CALLBACKS
1051 1091
1052=over 4 1092=over 4
… …
1125 my ($pl, $buf) = @_; 1165 my ($pl, $buf) = @_;
1126 1166
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1167 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1168
1129 if (ref $msg) { 1169 if (ref $msg) {
1170 my ($type, $reply, @payload) =
1171 "ARRAY" eq ref $msg
1172 ? @$msg
1173 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1174
1175 my @reply;
1176
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1177 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1178 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1179 }
1180
1181 $pl->ext_reply ($reply, @reply)
1182 if $reply;
1183
1135 } else { 1184 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1185 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1186 }
1138 1187
1139 cf::override; 1188 cf::override;
… …
1229 1278
1230=head3 cf::player 1279=head3 cf::player
1231 1280
1232=over 4 1281=over 4
1233 1282
1283=item cf::player::num_playing
1284
1285Returns the official number of playing players, as per the Crossfire metaserver rules.
1286
1287=cut
1288
1289sub num_playing {
1290 scalar grep
1291 $_->ob->map
1292 && !$_->hidden
1293 && !$_->ob->flag (cf::FLAG_WIZ),
1294 cf::player::list
1295}
1296
1234=item cf::player::find $login 1297=item cf::player::find $login
1235 1298
1236Returns the given player object, loading it if necessary (might block). 1299Returns the given player object, loading it if necessary (might block).
1237 1300
1238=cut 1301=cut
… …
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1336 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1337 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1338 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1339 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1340
1278 my $pl = load_pl path $login 1341 my $f = new_from_file cf::object::thawer path $login
1279 or return; 1342 or return;
1343
1344 $f->next;
1345 my $pl = cf::player::load_pl $f
1346 or return;
1347 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs;
1280 $cf::PLAYER{$login} = $pl 1349 $cf::PLAYER{$login} = $pl
1281 } 1350 }
1282 } 1351 }
1283} 1352}
1284 1353
… …
1294 1363
1295 aio_mkdir playerdir $pl, 0770; 1364 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1365 $pl->{last_save} = $cf::RUNTIME;
1297 1366
1298 $pl->save_pl ($path); 1367 $pl->save_pl ($path);
1299 Coro::cede; 1368 cf::cede_to_tick;
1300} 1369}
1301 1370
1302sub new($) { 1371sub new($) {
1303 my ($login) = @_; 1372 my ($login) = @_;
1304 1373
… …
1308 $self->{deny_save} = 1; 1377 $self->{deny_save} = 1;
1309 1378
1310 $cf::PLAYER{$login} = $self; 1379 $cf::PLAYER{$login} = $self;
1311 1380
1312 $self 1381 $self
1382}
1383
1384=item $player->send_msg ($channel, $msg, $color, [extra...])
1385
1386=cut
1387
1388sub send_msg {
1389 my $ns = shift->ns
1390 or return;
1391 $ns->send_msg (@_);
1313} 1392}
1314 1393
1315=item $pl->quit_character 1394=item $pl->quit_character
1316 1395
1317Nukes the player without looking back. If logged in, the connection will 1396Nukes the player without looking back. If logged in, the connection will
… …
1372 or return []; 1451 or return [];
1373 1452
1374 my @logins; 1453 my @logins;
1375 1454
1376 for my $login (@$dirs) { 1455 for my $login (@$dirs) {
1456 my $path = path $login;
1457
1458 # a .pst is a dead give-away for a valid player
1459 unless (-e "$path.pst") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1460 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1461 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1462 $buf !~ /^password -------------$/m or next; # official not-valid tag
1463 }
1380 1464
1381 utf8::decode $login; 1465 utf8::decode $login;
1382 push @logins, $login; 1466 push @logins, $login;
1383 } 1467 }
1384 1468
… …
1422sub expand_cfpod { 1506sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1507 ((my $self), (local $_)) = @_;
1424 1508
1425 # escape & and < 1509 # escape & and <
1426 s/&/&amp;/g; 1510 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g; 1511 s/(?<![BIUGHT])</&lt;/g;
1428 1512
1429 # this is buggy, it needs to properly take care of nested <'s 1513 # this is buggy, it needs to properly take care of nested <'s
1430 1514
1431 1 while 1515 1 while
1432 # replace B<>, I<>, U<> etc. 1516 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1517 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1518 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1519 || s/U<([^\>]*)>/<u>$1<\/u>/
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1436 # replace G<male|female> tags 1521 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1522 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1 1523 $self->gender ? $2 : $1
1439 }ge 1524 }ge
1440 # replace H<hint text> 1525 # replace H<hint text>
… …
1461sub hintmode { 1546sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1547 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1548 $_[0]{hintmode}
1464} 1549}
1465 1550
1466=item $player->ext_reply ($msgid, %msg) 1551=item $player->ext_reply ($msgid, @msg)
1467 1552
1468Sends an ext reply to the player. 1553Sends an ext reply to the player.
1469 1554
1470=cut 1555=cut
1471 1556
1472sub ext_reply($$%) { 1557sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1558 my ($self, $id, @msg) = @_;
1474 1559
1475 $msg{msgid} = $id; 1560 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1561}
1478 1562
1479=item $player->ext_event ($type, %msg) 1563=item $player->ext_msg ($type, @msg)
1480 1564
1481Sends an ext event to the client. 1565Sends an ext event to the client.
1482 1566
1483=cut 1567=cut
1484 1568
1485sub ext_event($$%) { 1569sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1570 my ($self, $type, @msg) = @_;
1487 1571
1488 $self->ns->ext_event ($type, %msg); 1572 $self->ns->ext_msg ($type, @msg);
1489} 1573}
1490 1574
1491=head3 cf::region 1575=head3 cf::region
1492 1576
1493=over 4 1577=over 4
… …
1709 1793
1710sub load_header_from($) { 1794sub load_header_from($) {
1711 my ($self, $path) = @_; 1795 my ($self, $path) = @_;
1712 1796
1713 utf8::encode $path; 1797 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1798 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 or return; 1799 or return;
1800
1801 $self->_load_header ($f)
1802 or return;
1803
1804 local $MAP_LOADING{$self->{path}} = $self;
1805 $f->resolve_delayed_derefs;
1719 1806
1720 $self->{load_path} = $path; 1807 $self->{load_path} = $path;
1721 1808
1722 1 1809 1
1723} 1810}
… …
1777sub find { 1864sub find {
1778 my ($path, $origin) = @_; 1865 my ($path, $origin) = @_;
1779 1866
1780 $path = normalise $path, $origin && $origin->path; 1867 $path = normalise $path, $origin && $origin->path;
1781 1868
1869 cf::lock_wait "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1870 cf::lock_wait "map_find:$path";
1783 1871
1784 $cf::MAP{$path} || do { 1872 $cf::MAP{$path} || do {
1785 my $guard = cf::lock_acquire "map_find:$path"; 1873 my $guard1 = cf::lock_acquire "map_find:$path";
1874 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1875
1786 my $map = new_from_path cf::map $path 1876 my $map = new_from_path cf::map $path
1787 or return; 1877 or return;
1788 1878
1789 $map->{last_save} = $cf::RUNTIME; 1879 $map->{last_save} = $cf::RUNTIME;
1790 1880
… …
1792 or return; 1882 or return;
1793 1883
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1884 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 1885 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 1886 #$cf::WAIT_FOR_TICK->wait;
1887 undef $guard1;
1888 undef $guard2;
1797 $map->reset; 1889 $map->reset;
1798 undef $guard;
1799 return find $path; 1890 return find $path;
1800 } 1891 }
1801 1892
1802 $cf::MAP{$path} = $map 1893 $cf::MAP{$path} = $map
1803 } 1894 }
… …
1812 local $self->{deny_reset} = 1; # loading can take a long time 1903 local $self->{deny_reset} = 1; # loading can take a long time
1813 1904
1814 my $path = $self->{path}; 1905 my $path = $self->{path};
1815 1906
1816 { 1907 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 1908 my $guard = cf::lock_acquire "map_data:$path";
1818 1909
1910 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 1911 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 1912
1821 $self->in_memory (cf::MAP_LOADING); 1913 $self->in_memory (cf::MAP_LOADING);
1822 1914
1823 $self->alloc; 1915 $self->alloc;
1824 1916
1825 $self->pre_load; 1917 $self->pre_load;
1826 Coro::cede; 1918 cf::cede_to_tick;
1827 1919
1920 my $f = new_from_file cf::object::thawer $self->{load_path};
1921 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 1922 $self->_load_objects ($f)
1829 or return; 1923 or return;
1830 1924
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1925 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original}; 1926 if delete $self->{load_original};
1833 1927
1834 if (my $uniq = $self->uniq_path) { 1928 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 1929 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 1930 unless (aio_stat $uniq) {
1931 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 1932 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 1933 $self->_load_objects ($f);
1934 $f->resolve_delayed_derefs;
1935 }
1839 } 1936 }
1840 } 1937 }
1841 1938
1842 Coro::cede; 1939 $f->resolve_delayed_derefs;
1940
1941 cf::cede_to_tick;
1843 # now do the right thing for maps 1942 # now do the right thing for maps
1844 $self->link_multipart_objects; 1943 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 1944 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 1945 unless $self->difficulty;
1847 Coro::cede; 1946 cf::cede_to_tick;
1848 1947
1849 unless ($self->{deny_activate}) { 1948 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 1949 $self->decay_objects;
1851 $self->fix_auto_apply; 1950 $self->fix_auto_apply;
1852 $self->update_buttons; 1951 $self->update_buttons;
1853 Coro::cede; 1952 cf::cede_to_tick;
1854 $self->set_darkness_map; 1953 $self->set_darkness_map;
1855 Coro::cede; 1954 cf::cede_to_tick;
1856 $self->activate; 1955 $self->activate;
1857 } 1956 }
1957
1958 $self->{last_save} = $cf::RUNTIME;
1959 $self->last_access ($cf::RUNTIME);
1858 1960
1859 $self->in_memory (cf::MAP_IN_MEMORY); 1961 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 1962 }
1861 1963
1862 $self->post_load; 1964 $self->post_load;
… …
1873 1975
1874 $self 1976 $self
1875} 1977}
1876 1978
1877# find and load all maps in the 3x3 area around a map 1979# find and load all maps in the 3x3 area around a map
1878sub load_diag { 1980sub load_neighbours {
1879 my ($map) = @_; 1981 my ($map) = @_;
1880 1982
1881 my @diag; # diagonal neighbours 1983 my @neigh; # diagonal neighbours
1882 1984
1883 for (0 .. 3) { 1985 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 1986 my $neigh = $map->tile_path ($_)
1885 or next; 1987 or next;
1886 $neigh = find $neigh, $map 1988 $neigh = find $neigh, $map
1887 or next; 1989 or next;
1888 $neigh->load; 1990 $neigh->load;
1889 1991
1992 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1993 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1994 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 1995 }
1893 1996
1894 for (@diag) { 1997 for (grep defined $_->[0], @neigh) {
1998 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 1999 my $neigh = find $path, $origin
1896 or next; 2000 or next;
1897 $neigh->load; 2001 $neigh->load;
1898 } 2002 }
1899} 2003}
1900 2004
… …
1905} 2009}
1906 2010
1907sub do_load_sync { 2011sub do_load_sync {
1908 my ($map) = @_; 2012 my ($map) = @_;
1909 2013
2014 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2015 if $Coro::current == $Coro::main;
2016
1910 cf::sync_job { $map->load }; 2017 cf::sync_job { $map->load };
1911} 2018}
1912 2019
1913our %MAP_PREFETCH; 2020our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2021our $MAP_PREFETCHER = undef;
1915 2022
1916sub find_async { 2023sub find_async {
1917 my ($path, $origin) = @_; 2024 my ($path, $origin, $load) = @_;
1918 2025
1919 $path = normalise $path, $origin && $origin->{path}; 2026 $path = normalise $path, $origin && $origin->{path};
1920 2027
1921 if (my $map = $cf::MAP{$path}) { 2028 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2029 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 2030 }
1924 2031
1925 undef $MAP_PREFETCH{$path}; 2032 $MAP_PREFETCH{$path} |= $load;
2033
1926 $MAP_PREFETCHER ||= cf::async { 2034 $MAP_PREFETCHER ||= cf::async {
1927 while (%MAP_PREFETCH) { 2035 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2036 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2037 if (my $map = find $k) {
1930 $map->load; 2038 $map->load if $v;
1931 } 2039 }
1932 2040
1933 delete $MAP_PREFETCH{$path}; 2041 delete $MAP_PREFETCH{$k};
1934 } 2042 }
1935 } 2043 }
1936 undef $MAP_PREFETCHER; 2044 undef $MAP_PREFETCHER;
1937 }; 2045 };
1938 $MAP_PREFETCHER->prio (6); 2046 $MAP_PREFETCHER->prio (6);
… …
1941} 2049}
1942 2050
1943sub save { 2051sub save {
1944 my ($self) = @_; 2052 my ($self) = @_;
1945 2053
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2054 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2055
1948 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
1949 2057
1950 return unless $self->dirty; 2058 return unless $self->dirty;
1951 2059
… …
1974 my ($self) = @_; 2082 my ($self) = @_;
1975 2083
1976 # save first because save cedes 2084 # save first because save cedes
1977 $self->save; 2085 $self->save;
1978 2086
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2087 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2088
1981 return if $self->players; 2089 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2090 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2091 return if $self->{deny_save};
1984 2092
2093 $self->in_memory (cf::MAP_SWAPPED);
2094
2095 $self->deactivate;
2096 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2097 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2098}
1988 2099
1989sub reset_at { 2100sub reset_at {
1990 my ($self) = @_; 2101 my ($self) = @_;
1991 2102
… …
2023 if $uniq; 2134 if $uniq;
2024 } 2135 }
2025 2136
2026 delete $cf::MAP{$self->path}; 2137 delete $cf::MAP{$self->path};
2027 2138
2139 $self->deactivate;
2140 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2141 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2142
2032 $self->unlink_save; 2143 $self->unlink_save;
2033 $self->destroy; 2144 $self->destroy;
2034} 2145}
2035 2146
2036my $nuke_counter = "aaaa"; 2147my $nuke_counter = "aaaa";
2037 2148
2038sub nuke { 2149sub nuke {
2039 my ($self) = @_; 2150 my ($self) = @_;
2040 2151
2152 {
2153 my $lock = cf::lock_acquire "map_data:$self->{path}";
2154
2041 delete $cf::MAP{$self->path}; 2155 delete $cf::MAP{$self->path};
2042 2156
2043 $self->unlink_save; 2157 $self->unlink_save;
2044 2158
2045 bless $self, "cf::map"; 2159 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2160 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2161 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2162 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2163 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2164
2051 $cf::MAP{$self->path} = $self; 2165 $cf::MAP{$self->path} = $self;
2166 }
2052 2167
2053 $self->reset; # polite request, might not happen 2168 $self->reset; # polite request, might not happen
2054} 2169}
2055 2170
2056=item $maps = cf::map::tmp_maps 2171=item $maps = cf::map::tmp_maps
… …
2132 2247
2133sub inv_recursive { 2248sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2249 inv_recursive_ inv $_[0]
2135} 2250}
2136 2251
2252=item $ref = $ob->ref
2253
2254creates and returns a persistent reference to an objetc that can be stored as a string.
2255
2256=item $ob = cf::object::deref ($refstring)
2257
2258returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2259even if the object actually exists. May block.
2260
2261=cut
2262
2263sub deref {
2264 my ($ref) = @_;
2265
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return;
2273 $pl->ob->uuid eq $uuid
2274 or return;
2275
2276 $pl->ob
2277 } else {
2278 warn "$ref: cannot resolve object reference\n";
2279 undef
2280 }
2281}
2282
2137package cf; 2283package cf;
2138 2284
2139=back 2285=back
2140 2286
2141=head3 cf::object::player 2287=head3 cf::object::player
… …
2163 2309
2164 } else { 2310 } else {
2165 my $pl = $self->contr; 2311 my $pl = $self->contr;
2166 2312
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2313 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2314 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2315 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2316
2176 } else { 2317 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2318 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2319 $self->message ($msg, $flags);
2179 } 2320 }
2180 } 2321 }
2322}
2323
2324=item $object->send_msg ($channel, $msg, $color, [extra...])
2325
2326=cut
2327
2328sub cf::object::send_msg {
2329 my $pl = shift->contr
2330 or return;
2331 $pl->send_msg (@_);
2181} 2332}
2182 2333
2183=item $player_object->may ("access") 2334=item $player_object->may ("access")
2184 2335
2185Returns wether the given player is authorized to access resource "access" 2336Returns wether the given player is authorized to access resource "access"
… …
2264 # use -1 or undef as default coordinates, not 0, 0 2415 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2416 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2417 if $x <=0 && $y <= 0;
2267 2418
2268 $map->load; 2419 $map->load;
2269 $map->load_diag; 2420 $map->load_neighbours;
2270 2421
2271 return unless $self->contr->active; 2422 return unless $self->contr->active;
2272 $self->activate_recursive; 2423 $self->activate_recursive;
2273 2424
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2425 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2596the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2597the message unless the client supports the msg packet.
2447 2598
2448=cut 2599=cut
2449 2600
2601our %CHANNEL = (
2602 "c/identify" => {
2603 id => "identify",
2604 title => "Identify",
2605 reply => undef,
2606 tooltip => "Items recently identified",
2607 },
2608 "c/examine" => {
2609 id => "examine",
2610 title => "Examine",
2611 reply => undef,
2612 tooltip => "Signs and other items you examined",
2613 },
2614);
2615
2450sub cf::client::send_msg { 2616sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2617 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2618
2453 $msg = $self->pl->expand_cfpod ($msg); 2619 $msg = $self->pl->expand_cfpod ($msg);
2454 2620
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2621 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622
2623 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2456 2625
2457 if (ref $channel) { 2626 if (ref $channel) {
2458 # send meta info to client, if not yet sent 2627 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2628 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2629 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2630 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg;
2462 } 2632 }
2463 2633
2464 $channel = $channel->{id}; 2634 $channel = $channel->{id};
2465 } 2635 }
2466 2636
2467 return unless @extra || length $msg; 2637 return unless @extra || length $msg;
2468 2638
2469 if ($self->can_msg) { 2639 if ($self->can_msg) {
2640 # default colour, mask it out
2641 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2642 if $color & cf::NDI_DEF;
2643
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2644 $self->send_packet ("msg " . $self->{json_coder}->encode (
2645 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2646 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2647 if ($color >= 0) {
2648 # replace some tags by gcfclient-compatible ones
2649 for ($msg) {
2650 1 while
2651 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2652 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2653 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2654 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2655 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2656 }
2657
2658 $color &= cf::NDI_COLOR_MASK;
2659
2660 utf8::encode $msg;
2661
2483 if (0 && $msg =~ /\[/) { 2662 if (0 && $msg =~ /\[/) {
2663 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2664 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2665 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2666 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2667 $self->send_packet ("drawinfo $color $msg")
2488 } 2668 }
2489 } 2669 }
2490 } 2670 }
2491} 2671}
2492 2672
2493=item $client->ext_event ($type, %msg) 2673=item $client->ext_msg ($type, @msg)
2494 2674
2495Sends an ext event to the client. 2675Sends an ext event to the client.
2496 2676
2497=cut 2677=cut
2498 2678
2499sub cf::client::ext_event($$%) { 2679sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2680 my ($self, $type, @msg) = @_;
2501 2681
2502 return unless $self->extcmd; 2682 if ($self->extcmd == 2) {
2503 2683 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2684 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2685 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2686 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2687 }
2688}
2689
2690=item $client->ext_reply ($msgid, @msg)
2691
2692Sends an ext reply to the client.
2693
2694=cut
2695
2696sub cf::client::ext_reply($$@) {
2697 my ($self, $id, @msg) = @_;
2698
2699 if ($self->extcmd == 2) {
2700 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2701 } elsif ($self->extcmd == 1) {
2702 #TODO: version 1, remove
2703 unshift @msg, msgtype => "reply", msgid => $id;
2704 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2705 }
2506} 2706}
2507 2707
2508=item $success = $client->query ($flags, "text", \&cb) 2708=item $success = $client->query ($flags, "text", \&cb)
2509 2709
2510Queues a query to the client, calling the given callback with 2710Queues a query to the client, calling the given callback with
… …
2565 my ($ns, $buf) = @_; 2765 my ($ns, $buf) = @_;
2566 2766
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2767 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2768
2569 if (ref $msg) { 2769 if (ref $msg) {
2770 my ($type, $reply, @payload) =
2771 "ARRAY" eq ref $msg
2772 ? @$msg
2773 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2774
2775 my @reply;
2776
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2777 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2778 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2779 }
2780
2781 $ns->ext_reply ($reply, @reply)
2782 if $reply;
2783
2576 } else { 2784 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2785 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2786 }
2579 2787
2580 cf::override; 2788 cf::override;
… …
2627our $safe = new Safe "safe"; 2835our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 2836our $safe_hole = new Safe::Hole;
2629 2837
2630$SIG{FPE} = 'IGNORE'; 2838$SIG{FPE} = 'IGNORE';
2631 2839
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2840$safe->permit_only (Opcode::opset qw(
2841 :base_core :base_mem :base_orig :base_math
2842 grepstart grepwhile mapstart mapwhile
2843 sort time
2844));
2633 2845
2634# here we export the classes and methods available to script code 2846# here we export the classes and methods available to script code
2635 2847
2636=pod 2848=pod
2637 2849
2638The following functions and methods are available within a safe environment: 2850The following functions and methods are available within a safe environment:
2639 2851
2640 cf::object 2852 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 2853 contr pay_amount pay_player map x y force_find force_add
2642 insert remove 2854 insert remove name archname title slaying race decrease_ob_nr
2643 2855
2644 cf::object::player 2856 cf::object::player
2645 player 2857 player
2646 2858
2647 cf::player 2859 cf::player
… …
2652 2864
2653=cut 2865=cut
2654 2866
2655for ( 2867for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2868 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2869 insert remove inv name archname title slaying race
2657 insert remove)], 2870 decrease_ob_nr)],
2658 ["cf::object::player" => qw(player)], 2871 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 2872 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 2873 ["cf::map" => qw(trigger)],
2661) { 2874) {
2662 no strict 'refs'; 2875 no strict 'refs';
… …
2738# the server's init and main functions 2951# the server's init and main functions
2739 2952
2740sub load_facedata($) { 2953sub load_facedata($) {
2741 my ($path) = @_; 2954 my ($path) = @_;
2742 2955
2956 # HACK to clear player env face cache, we need some signal framework
2957 # for this (global event?)
2958 %ext::player_env::MUSIC_FACE_CACHE = ();
2959
2960 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2961
2743 warn "loading facedata from $path\n"; 2962 warn "loading facedata from $path\n";
2744 2963
2745 my $facedata; 2964 my $facedata;
2746 0 < aio_load $path, $facedata 2965 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 2966 or die "$path: $!";
2748 2967
2749 $facedata = Coro::Storable::thaw $facedata; 2968 $facedata = Coro::Storable::thaw $facedata;
2750 2969
2751 $facedata->{version} == 2 2970 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 2971 or cf::cleanup "$path: version mismatch, cannot proceed.";
2972
2973 # patch in the exptable
2974 $facedata->{resource}{"res/exp_table"} = {
2975 type => FT_RSRC,
2976 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2977 };
2978 cf::cede_to_tick;
2753 2979
2754 { 2980 {
2755 my $faces = $facedata->{faceinfo}; 2981 my $faces = $facedata->{faceinfo};
2756 2982
2757 while (my ($face, $info) = each %$faces) { 2983 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2984 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 2985 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 2986 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2987 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2988 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 2989
2764 cf::cede_to_tick; 2990 cf::cede_to_tick;
2765 } 2991 }
2766 2992
2767 while (my ($face, $info) = each %$faces) { 2993 while (my ($face, $info) = each %$faces) {
… …
2792 3018
2793 { 3019 {
2794 # TODO: for gcfclient pleasure, we should give resources 3020 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3021 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3022 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 3023
3024 my $soundconf = delete $res->{"res/sound.conf"};
2798 3025
2799 while (my ($name, $info) = each %$res) { 3026 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3027 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3028 my $data;
2807 3029
2808 if ($name =~ /\.jpg$/) { 3030 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3031 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3032
3033 my $meta = $enc->encode ({
3034 name => $name,
3035 %{ $info->{meta} || {} },
3036 });
3037
3038 $data = pack "(w/a*)*", $meta, $info->{data};
2811 } else { 3039 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3040 $data = $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3041 }
2818 3042
3043 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3044 cf::face::set_type $idx, $info->{type};
3045
2819 cf::cede_to_tick; 3046 cf::cede_to_tick;
2820 } 3047 }
3048
3049 if ($soundconf) {
3050 $soundconf = $enc->decode (delete $soundconf->{data});
3051
3052 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3053 my $sound = $soundconf->{compat}[$_]
3054 or next;
3055
3056 my $face = cf::face::find "sound/$sound->[1]";
3057 cf::sound::set $sound->[0] => $face;
3058 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3059 }
3060
3061 while (my ($k, $v) = each %{$soundconf->{event}}) {
3062 my $face = cf::face::find "sound/$v";
3063 cf::sound::set $k => $face;
3064 }
3065 }
2821 } 3066 }
2822 3067
2823 1 3068 1
2824} 3069}
2825 3070
3071register_exticmd fx_want => sub {
3072 my ($ns, $want) = @_;
3073
3074 while (my ($k, $v) = each %$want) {
3075 $ns->fx_want ($k, $v);
3076 }
3077};
3078
2826sub reload_regions { 3079sub reload_regions {
3080 # HACK to clear player env face cache, we need some signal framework
3081 # for this (global event?)
3082 %ext::player_env::MUSIC_FACE_CACHE = ();
3083
2827 load_resource_file "$MAPDIR/regions" 3084 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3085 or die "unable to load regions file\n";
2829 3086
2830 for (cf::region::list) { 3087 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3088 $_->{match} = qr/$_->{match}/
… …
2867 3124
2868sub init { 3125sub init {
2869 reload_resources; 3126 reload_resources;
2870} 3127}
2871 3128
2872sub cfg_load { 3129sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3130 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3131 or return;
2875 3132
2876 local $/; 3133 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3134 *CFG = YAML::Syck::Load <$fh>;
… …
2897 (async { 3154 (async {
2898 Event::one_event; 3155 Event::one_event;
2899 })->prio (Coro::PRIO_MAX); 3156 })->prio (Coro::PRIO_MAX);
2900 }; 3157 };
2901 3158
2902 cfg_load; 3159 reload_config;
2903 db_init; 3160 db_init;
2904 load_extensions; 3161 load_extensions;
2905 3162
2906 $TICK_WATCHER->start; 3163 $TICK_WATCHER->start;
2907 Event::loop; 3164 Event::loop;
… …
3100 warn "reloading cf.pm"; 3357 warn "reloading cf.pm";
3101 require cf; 3358 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3359 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3360
3104 warn "loading config and database again"; 3361 warn "loading config and database again";
3105 cf::cfg_load; 3362 cf::reload_config;
3106 3363
3107 warn "loading extensions"; 3364 warn "loading extensions";
3108 cf::load_extensions; 3365 cf::load_extensions;
3109 3366
3110 warn "reattaching attachments to objects/players"; 3367 warn "reattaching attachments to objects/players";
… …
3203 or die; 3460 or die;
3204 3461
3205 $map->width (50); 3462 $map->width (50);
3206 $map->height (50); 3463 $map->height (50);
3207 $map->alloc; 3464 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1); 3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3209 my $t = Event::time - $t; 3466 my $t = Event::time - $t;
3210 3467
3211 #next unless $t < 0.0013;#d# 3468 #next unless $t < 0.0013;#d#
3212 if ($t < $min) { 3469 if ($t < $min) {
3213 $min = $t; 3470 $min = $t;

Diff Legend

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