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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.358 by root, Fri Sep 7 18:10:52 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
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
84our %CFG; 87our %CFG;
85 88
86our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
87our $RUNTIME; 90our $RUNTIME;
88 91
89our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
90our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
91our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
92 95
93# 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 ∕
94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95 98
… …
164=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
165 168
166These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
167returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
168per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
169 178
170=back 179=back
171 180
172=cut 181=cut
173 182
… …
237 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238 $d 247 $d
239 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
240} 249}
241 250
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
245 252
246Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
247 254
248=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
249 256
250Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
251 258
252=cut 259=cut
253 260
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 262
256sub to_json ($) { $json_coder->encode ($_[0]) } 263sub to_json ($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 264sub from_json ($) { $json_coder->decode ($_[0]) }
258 265
259=item cf::lock_wait $string 266=item cf::lock_wait $string
… …
265Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
268returned. 275returned.
269 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
270Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
272 282
273=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
274 284
275Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
276 286
277=cut 287=cut
278 288
279our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
280 291
281sub lock_wait($) { 292sub lock_wait($) {
282 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
283 299
284 # wait for lock, if any 300 # wait for lock, if any
285 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule; 303 Coro::schedule;
… …
293 309
294 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
295 lock_wait $key; 311 lock_wait $key;
296 312
297 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
298 315
299 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
300 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
302 } 320 }
303} 321}
304 322
… …
314 my $guard = Coro::guard { 332 my $guard = Coro::guard {
315 $TICK_WATCHER->start; 333 $TICK_WATCHER->start;
316 }; 334 };
317 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
318 $guard 336 $guard
337}
338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
319} 393}
320 394
321=item cf::async { BLOCK } 395=item cf::async { BLOCK }
322 396
323Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
… …
413=cut 487=cut
414 488
415sub fork_call(&@) { 489sub fork_call(&@) {
416 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
417 491
418# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 492 # we seemingly have to make a local copy of the whole thing,
419# or die "socketpair: $!"; 493 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 494 # TODO: investigate and fix (likely this will be rather laborious)
421 or die "pipe: $!";
422 495
423 if (my $pid = fork) { 496 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 497 reset_signals;
436 local $SIG{__WARN__}; 498 &$cb
437 local $SIG{__DIE__}; 499 }, @args;
438 eval {
439 close $fh1;
440 500
441 my @res = eval { $cb->(@args) }; 501 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443 };
444
445 warn $@ if $@;
446 _exit 0;
447 }
448} 502}
449 503
450=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
451 505
452Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
532 if (1) { 586 if (1) {
533 $md5 = 587 $md5 =
534 join "\x00", 588 join "\x00",
535 $processversion, 589 $processversion,
536 map { 590 map {
537 Coro::cede; 591 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 593 } 0.. $#$src;
540 594
541 595
542 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
848 "; 902 ";
849 die if $@; 903 die if $@;
850} 904}
851 905
852our $override; 906our $override;
853our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 907our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854 908
855sub override { 909sub override {
856 $override = 1; 910 $override = 1;
857 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
858} 912}
859 913
860sub do_invoke { 914sub do_invoke {
861 my $event = shift; 915 my $event = shift;
862 my $callbacks = shift; 916 my $callbacks = shift;
863 917
864 @invoke_results = (); 918 @INVOKE_RESULTS = ();
865 919
866 local $override; 920 local $override;
867 921
868 for (@$callbacks) { 922 for (@$callbacks) {
869 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
… …
886 940
887Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
888 942
889This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 943This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
890removed in future versions), and there is no public API to access override 944removed in future versions), and there is no public API to access override
891results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 946
893=back 947=back
894 948
895=cut 949=cut
896 950
897############################################################################# 951#############################################################################
898# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
899 964
900sub reattach { 965sub reattach {
901 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 967 my ($obj) = @_;
903 968
… …
947 }, 1012 },
948); 1013);
949 1014
950sub object_freezer_save { 1015sub object_freezer_save {
951 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
952 1019
953 sync_job { 1020 sync_job {
954 if (length $$rdata) { 1021 if (length $$rdata) {
955 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
956 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
980 } 1047 }
981 } else { 1048 } else {
982 aio_unlink $filename; 1049 aio_unlink $filename;
983 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
984 } 1051 }
985 } 1052 };
1053
1054 undef $guard;
986} 1055}
987 1056
988sub object_freezer_as_string { 1057sub object_freezer_as_string {
989 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
990 1059
… …
995 1064
996sub object_thawer_load { 1065sub object_thawer_load {
997 my ($filename) = @_; 1066 my ($filename) = @_;
998 1067
999 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1000 1071
1001 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1002 or return; 1073 or return;
1003 1074
1004 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1005 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1006 or return; 1077 or return;
1078
1079 undef $guard;
1007 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1008 } 1081 }
1009 1082
1010 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1011 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1012 return ($data, $av); 1086 ($data, $av)
1013} 1087}
1014 1088
1015=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1016 1090
1017=over 4 1091=over 4
… …
1087 cf::override; 1161 cf::override;
1088 }, 1162 },
1089 on_extcmd => sub { 1163 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
1091 1165
1092 my $msg = eval { from_json $buf }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1167
1094 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1100 } else { 1183 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1185 }
1103 1186
1104 cf::override; 1187 cf::override;
… …
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1325
1243 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1244 or return; 1327 or return;
1328
1329 $f->next;
1330 my $pl = cf::player::load_pl $f
1331 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs;
1245 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1246 } 1335 }
1247 } 1336 }
1248} 1337}
1249 1338
… …
1259 1348
1260 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1262 1351
1263 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1264 Coro::cede; 1353 cf::cede_to_tick;
1265} 1354}
1266 1355
1267sub new($) { 1356sub new($) {
1268 my ($login) = @_; 1357 my ($login) = @_;
1269 1358
… …
1273 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1274 1363
1275 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1276 1365
1277 $self 1366 $self
1367}
1368
1369=item $player->send_msg ($channel, $msg, $color, [extra...])
1370
1371=cut
1372
1373sub send_msg {
1374 my $ns = shift->ns
1375 or return;
1376 $ns->send_msg (@_);
1278} 1377}
1279 1378
1280=item $pl->quit_character 1379=item $pl->quit_character
1281 1380
1282Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
… …
1337 or return []; 1436 or return [];
1338 1437
1339 my @logins; 1438 my @logins;
1340 1439
1341 for my $login (@$dirs) { 1440 for my $login (@$dirs) {
1441 my $path = path $login;
1442
1443 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1345 1449
1346 utf8::decode $login; 1450 utf8::decode $login;
1347 push @logins, $login; 1451 push @logins, $login;
1348 } 1452 }
1349 1453
… …
1387sub expand_cfpod { 1491sub expand_cfpod {
1388 ((my $self), (local $_)) = @_; 1492 ((my $self), (local $_)) = @_;
1389 1493
1390 # escape & and < 1494 # escape & and <
1391 s/&/&amp;/g; 1495 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g; 1496 s/(?<![BIUGHT])</&lt;/g;
1393 1497
1394 # this is buggy, it needs to properly take care of nested <'s 1498 # this is buggy, it needs to properly take care of nested <'s
1395 1499
1396 1 while 1500 1 while
1397 # replace B<>, I<>, U<> etc. 1501 # replace B<>, I<>, U<> etc.
1398 s/B<([^\>]*)>/<b>$1<\/b>/ 1502 s/B<([^\>]*)>/<b>$1<\/b>/
1399 || s/I<([^\>]*)>/<i>$1<\/i>/ 1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1400 || s/U<([^\>]*)>/<u>$1<\/u>/ 1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1401 # replace G<male|female> tags 1506 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1507 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1 1508 $self->gender ? $2 : $1
1404 }ge 1509 }ge
1405 # replace H<hint text> 1510 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1407 1518
1408 # create single paragraphs (very hackish) 1519 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1520 s/(?<=\S)\n(?=\w)/ /g;
1410 1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1411 $_ 1528 $_
1412} 1529}
1413 1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535
1414=item $player->ext_reply ($msgid, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1415 1537
1416Sends an ext reply to the player. 1538Sends an ext reply to the player.
1417 1539
1418=cut 1540=cut
1419 1541
1420sub ext_reply($$%) { 1542sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1422 1544
1423 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1546}
1426 1547
1427=item $player->ext_event ($type, %msg) 1548=item $player->ext_msg ($type, @msg)
1428 1549
1429Sends an ext event to the client. 1550Sends an ext event to the client.
1430 1551
1431=cut 1552=cut
1432 1553
1433sub ext_event($$%) { 1554sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1555 my ($self, $type, @msg) = @_;
1435 1556
1436 $self->ns->ext_event ($type, %msg); 1557 $self->ns->ext_msg ($type, @msg);
1437} 1558}
1438 1559
1439=head3 cf::region 1560=head3 cf::region
1440 1561
1441=over 4 1562=over 4
… …
1454 my ($path) = @_; 1575 my ($path) = @_;
1455 1576
1456 my ($match, $specificity); 1577 my ($match, $specificity);
1457 1578
1458 for my $region (list) { 1579 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1580 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1581 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1582 if $region->specificity > $specificity;
1462 } 1583 }
1463 } 1584 }
1464 1585
… …
1584 $self->init; # pass $1 etc. 1705 $self->init; # pass $1 etc.
1585 return $self; 1706 return $self;
1586 } 1707 }
1587 } 1708 }
1588 1709
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1710 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1711 ()
1591} 1712}
1592 1713
1593sub init { 1714sub init {
1594 my ($self) = @_; 1715 my ($self) = @_;
… …
1657 1778
1658sub load_header_from($) { 1779sub load_header_from($) {
1659 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1660 1781
1661 utf8::encode $path; 1782 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 or return; 1784 or return;
1785
1786 $self->_load_header ($f)
1787 or return;
1788
1789 local $MAP_LOADING{$self->{path}} = $self;
1790 $f->resolve_delayed_derefs;
1667 1791
1668 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1669 1793
1670 1 1794 1
1671} 1795}
… …
1725sub find { 1849sub find {
1726 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1727 1851
1728 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1729 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1730 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1731 1856
1732 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1733 my $guard = cf::lock_acquire "map_find:$path"; 1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1734 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1735 or return; 1862 or return;
1736 1863
1737 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1738 1865
… …
1740 or return; 1867 or return;
1741 1868
1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1744 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1745 $map->reset; 1874 $map->reset;
1746 undef $guard;
1747 return find $path; 1875 return find $path;
1748 } 1876 }
1749 1877
1750 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1751 } 1879 }
… …
1760 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1761 1889
1762 my $path = $self->{path}; 1890 my $path = $self->{path};
1763 1891
1764 { 1892 {
1765 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1766 1894
1895 return unless $self->valid;
1767 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1768 1897
1769 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1770 1899
1771 $self->alloc; 1900 $self->alloc;
1772 1901
1773 $self->pre_load; 1902 $self->pre_load;
1774 Coro::cede; 1903 cf::cede_to_tick;
1775 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1776 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1777 or return; 1908 or return;
1778 1909
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1781 1912
1782 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 1914 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 1917 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1787 } 1921 }
1788 } 1922 }
1789 1923
1790 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1791 # now do the right thing for maps 1927 # now do the right thing for maps
1792 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 1930 unless $self->difficulty;
1795 Coro::cede; 1931 cf::cede_to_tick;
1796 1932
1797 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 1934 $self->decay_objects;
1799 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1800 $self->update_buttons; 1936 $self->update_buttons;
1801 Coro::cede; 1937 cf::cede_to_tick;
1802 $self->set_darkness_map; 1938 $self->set_darkness_map;
1803 Coro::cede; 1939 cf::cede_to_tick;
1804 $self->activate; 1940 $self->activate;
1805 } 1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1806 1945
1807 $self->in_memory (cf::MAP_IN_MEMORY); 1946 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 1947 }
1809 1948
1810 $self->post_load; 1949 $self->post_load;
… …
1821 1960
1822 $self 1961 $self
1823} 1962}
1824 1963
1825# find and load all maps in the 3x3 area around a map 1964# find and load all maps in the 3x3 area around a map
1826sub load_diag { 1965sub load_neighbours {
1827 my ($map) = @_; 1966 my ($map) = @_;
1828 1967
1829 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1830 1969
1831 for (0 .. 3) { 1970 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1833 or next; 1972 or next;
1834 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1835 or next; 1974 or next;
1836 $neigh->load; 1975 $neigh->load;
1837 1976
1977 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 1980 }
1841 1981
1842 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1844 or next; 1985 or next;
1845 $neigh->load; 1986 $neigh->load;
1846 } 1987 }
1847} 1988}
1848 1989
… …
1853} 1994}
1854 1995
1855sub do_load_sync { 1996sub do_load_sync {
1856 my ($map) = @_; 1997 my ($map) = @_;
1857 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1858 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1859} 2003}
1860 2004
1861our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1863 2007
1864sub find_async { 2008sub find_async {
1865 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1866 2010
1867 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1868 2012
1869 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871 } 2015 }
1872 2016
1873 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1874 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2022 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2023 $map->load if $v;
2024 }
1880 2025
1881 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1882 } 2027 }
1883 } 2028 }
1884 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1885 }; 2030 };
1886 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
1889} 2034}
1890 2035
1891sub save { 2036sub save {
1892 my ($self) = @_; 2037 my ($self) = @_;
1893 2038
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 2040
1896 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1897 2042
1898 return unless $self->dirty; 2043 return unless $self->dirty;
1899 2044
… …
1922 my ($self) = @_; 2067 my ($self) = @_;
1923 2068
1924 # save first because save cedes 2069 # save first because save cedes
1925 $self->save; 2070 $self->save;
1926 2071
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2073
1929 return if $self->players; 2074 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
1931 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1932 2077
2078 $self->deactivate;
1933 $self->clear; 2079 $self->clear;
1934 $self->in_memory (cf::MAP_SWAPPED); 2080 $self->in_memory (cf::MAP_SWAPPED);
1935} 2081}
1936 2082
1937sub reset_at { 2083sub reset_at {
… …
1971 if $uniq; 2117 if $uniq;
1972 } 2118 }
1973 2119
1974 delete $cf::MAP{$self->path}; 2120 delete $cf::MAP{$self->path};
1975 2121
2122 $self->deactivate;
1976 $self->clear; 2123 $self->clear;
1977 2124
1978 $_->clear_links_to ($self) for values %cf::MAP; 2125 $_->clear_links_to ($self) for values %cf::MAP;
1979 2126
1980 $self->unlink_save; 2127 $self->unlink_save;
… …
1984my $nuke_counter = "aaaa"; 2131my $nuke_counter = "aaaa";
1985 2132
1986sub nuke { 2133sub nuke {
1987 my ($self) = @_; 2134 my ($self) = @_;
1988 2135
2136 {
2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138
1989 delete $cf::MAP{$self->path}; 2139 delete $cf::MAP{$self->path};
1990 2140
1991 $self->unlink_save; 2141 $self->unlink_save;
1992 2142
1993 bless $self, "cf::map"; 2143 bless $self, "cf::map";
1994 delete $self->{deny_reset}; 2144 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2145 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2146 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2147 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2148
1999 $cf::MAP{$self->path} = $self; 2149 $cf::MAP{$self->path} = $self;
2150 }
2000 2151
2001 $self->reset; # polite request, might not happen 2152 $self->reset; # polite request, might not happen
2002} 2153}
2003 2154
2004=item $maps = cf::map::tmp_maps 2155=item $maps = cf::map::tmp_maps
… …
2080 2231
2081sub inv_recursive { 2232sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2233 inv_recursive_ inv $_[0]
2083} 2234}
2084 2235
2236=item $ref = $ob->ref
2237
2238creates and returns a persistent reference to an objetc that can be stored as a string.
2239
2240=item $ob = cf::object::deref ($refstring)
2241
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block.
2244
2245=cut
2246
2247sub deref {
2248 my ($ref) = @_;
2249
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return;
2257 $pl->ob->uuid eq $uuid
2258 or return;
2259
2260 $pl->ob
2261 } else {
2262 warn "$ref: cannot resolve object reference\n";
2263 undef
2264 }
2265}
2266
2085package cf; 2267package cf;
2086 2268
2087=back 2269=back
2088 2270
2089=head3 cf::object::player 2271=head3 cf::object::player
… …
2111 2293
2112 } else { 2294 } else {
2113 my $pl = $self->contr; 2295 my $pl = $self->contr;
2114 2296
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2297 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2298 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2299 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2300
2124 } else { 2301 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2302 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2303 $self->message ($msg, $flags);
2127 } 2304 }
2128 } 2305 }
2306}
2307
2308=item $object->send_msg ($channel, $msg, $color, [extra...])
2309
2310=cut
2311
2312sub cf::object::send_msg {
2313 my $pl = shift->contr
2314 or return;
2315 $pl->send_msg (@_);
2129} 2316}
2130 2317
2131=item $player_object->may ("access") 2318=item $player_object->may ("access")
2132 2319
2133Returns wether the given player is authorized to access resource "access" 2320Returns wether the given player is authorized to access resource "access"
… …
2212 # use -1 or undef as default coordinates, not 0, 0 2399 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2400 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2401 if $x <=0 && $y <= 0;
2215 2402
2216 $map->load; 2403 $map->load;
2217 $map->load_diag; 2404 $map->load_neighbours;
2218 2405
2219 return unless $self->contr->active; 2406 return unless $self->contr->active;
2220 $self->activate_recursive; 2407 $self->activate_recursive;
2221 2408
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2409 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2410 $self->enter_map ($map, $x, $y);
2224} 2411}
2225 2412
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2413=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2414
2228Moves the player to the given map-path and coordinates by first freezing 2415Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2416her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2417that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2418the new (success) or old (failed) map position. In either case, $done will
2419be called at the end of this process.
2232 2420
2233=cut 2421=cut
2234 2422
2235our $GOTOGEN; 2423our $GOTOGEN;
2236 2424
2237sub cf::object::player::goto { 2425sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2426 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2427
2240 # do generation counting so two concurrent goto's will be executed in-order 2428 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2430
2243 $self->enter_link; 2431 $self->enter_link;
… …
2263 2451
2264 if ($gen == $self->{_goto_generation}) { 2452 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2453 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2454 $self->leave_link ($map, $x, $y);
2267 } 2455 }
2456
2457 $done->() if $done;
2268 })->prio (1); 2458 })->prio (1);
2269} 2459}
2270 2460
2271=item $player_object->enter_exit ($exit_object) 2461=item $player_object->enter_exit ($exit_object)
2272 2462
… …
2341 my $hp = $exit->stats->hp; 2531 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2532 my $sp = $exit->stats->sp;
2343 2533
2344 $self->enter_link; 2534 $self->enter_link;
2345 2535
2536 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED);
2539
2346 (async { 2540 (async {
2347 $self->deactivate_recursive; # just to be sure 2541 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2542 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2543 $self->goto ($slaying, $hp, $sp);
2350 2544
… …
2377 2571
2378 utf8::encode $text; 2572 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2573 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2574}
2381 2575
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2576=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2577
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2578Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of 2579client if neccessary. C<$type> should be a string identifying the type of
2386the message, with C<log> being the default. If C<$color> is negative, suppress 2580the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2581the message unless the client supports the msg packet.
2388 2582
2389=cut 2583=cut
2390 2584
2585our %CHANNEL = (
2586 "c/identify" => {
2587 id => "identify",
2588 title => "Identify",
2589 reply => undef,
2590 tooltip => "Items recently identified",
2591 },
2592 "c/examine" => {
2593 id => "examine",
2594 title => "Examine",
2595 reply => undef,
2596 tooltip => "Signs and other items you examined",
2597 },
2598);
2599
2391sub cf::client::send_msg { 2600sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2601 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2602
2394 $msg = $self->pl->expand_cfpod ($msg); 2603 $msg = $self->pl->expand_cfpod ($msg);
2395 2604
2605 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606
2607 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2609
2610 if (ref $channel) {
2611 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg;
2616 }
2617
2618 $channel = $channel->{id};
2619 }
2620
2621 return unless @extra || length $msg;
2622
2396 if ($self->can_msg) { 2623 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2624 # default colour, mask it out
2625 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2626 if $color & cf::NDI_DEF;
2627
2628 $self->send_packet ("msg " . $self->{json_coder}->encode (
2629 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2630 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408
2409 if ($color >= 0) { 2631 if ($color >= 0) {
2632 # replace some tags by gcfclient-compatible ones
2633 for ($msg) {
2634 1 while
2635 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2636 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2637 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2638 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2639 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2640 }
2641
2642 $color &= cf::NDI_COLOR_MASK;
2643
2644 utf8::encode $msg;
2645
2410 if (0 && $msg =~ /\[/) { 2646 if (0 && $msg =~ /\[/) {
2647 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2648 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2649 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2650 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2651 $self->send_packet ("drawinfo $color $msg")
2415 } 2652 }
2416 } 2653 }
2417 } 2654 }
2418} 2655}
2419 2656
2420=item $client->ext_event ($type, %msg) 2657=item $client->ext_msg ($type, @msg)
2421 2658
2422Sends an ext event to the client. 2659Sends an ext event to the client.
2423 2660
2424=cut 2661=cut
2425 2662
2426sub cf::client::ext_event($$%) { 2663sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2664 my ($self, $type, @msg) = @_;
2428 2665
2666 if ($self->extcmd == 2) {
2667 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2668 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2669 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2670 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2671 }
2672}
2673
2674=item $client->ext_reply ($msgid, @msg)
2675
2676Sends an ext reply to the client.
2677
2678=cut
2679
2680sub cf::client::ext_reply($$@) {
2681 my ($self, $id, @msg) = @_;
2682
2683 if ($self->extcmd == 2) {
2684 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2685 } elsif ($self->extcmd == 1) {
2686 #TODO: version 1, remove
2687 unshift @msg, msgtype => "reply", msgid => $id;
2688 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2689 }
2431} 2690}
2432 2691
2433=item $success = $client->query ($flags, "text", \&cb) 2692=item $success = $client->query ($flags, "text", \&cb)
2434 2693
2435Queues a query to the client, calling the given callback with 2694Queues a query to the client, calling the given callback with
… …
2458 2717
2459 1 2718 1
2460} 2719}
2461 2720
2462cf::client->attach ( 2721cf::client->attach (
2722 on_connect => sub {
2723 my ($ns) = @_;
2724
2725 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2726 },
2463 on_reply => sub { 2727 on_reply => sub {
2464 my ($ns, $msg) = @_; 2728 my ($ns, $msg) = @_;
2465 2729
2466 # this weird shuffling is so that direct followup queries 2730 # this weird shuffling is so that direct followup queries
2467 # get handled first 2731 # get handled first
… …
2482 } 2746 }
2483 }, 2747 },
2484 on_exticmd => sub { 2748 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2749 my ($ns, $buf) = @_;
2486 2750
2487 my $msg = eval { from_json $buf }; 2751 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2752
2489 if (ref $msg) { 2753 if (ref $msg) {
2754 my ($type, $reply, @payload) =
2755 "ARRAY" eq ref $msg
2756 ? @$msg
2757 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2758
2759 my @reply;
2760
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2761 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2762 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 2763 }
2764
2765 $ns->ext_reply ($reply, @reply)
2766 if $reply;
2767
2496 } else { 2768 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2769 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2770 }
2499 2771
2500 cf::override; 2772 cf::override;
… …
2547our $safe = new Safe "safe"; 2819our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 2820our $safe_hole = new Safe::Hole;
2549 2821
2550$SIG{FPE} = 'IGNORE'; 2822$SIG{FPE} = 'IGNORE';
2551 2823
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2824$safe->permit_only (Opcode::opset qw(
2825 :base_core :base_mem :base_orig :base_math
2826 grepstart grepwhile mapstart mapwhile
2827 sort time
2828));
2553 2829
2554# here we export the classes and methods available to script code 2830# here we export the classes and methods available to script code
2555 2831
2556=pod 2832=pod
2557 2833
2558The following functions and methods are available within a safe environment: 2834The following functions and methods are available within a safe environment:
2559 2835
2560 cf::object contr pay_amount pay_player map 2836 cf::object
2837 contr pay_amount pay_player map x y force_find force_add
2838 insert remove name archname title slaying race decrease_ob_nr
2839
2561 cf::object::player player 2840 cf::object::player
2562 cf::player peaceful 2841 player
2563 cf::map trigger 2842
2843 cf::player
2844 peaceful
2845
2846 cf::map
2847 trigger
2564 2848
2565=cut 2849=cut
2566 2850
2567for ( 2851for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race
2854 decrease_ob_nr)],
2569 ["cf::object::player" => qw(player)], 2855 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2856 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2857 ["cf::map" => qw(trigger)],
2572) { 2858) {
2573 no strict 'refs'; 2859 no strict 'refs';
… …
2649# the server's init and main functions 2935# the server's init and main functions
2650 2936
2651sub load_facedata($) { 2937sub load_facedata($) {
2652 my ($path) = @_; 2938 my ($path) = @_;
2653 2939
2940 # HACK to clear player env face cache, we need some signal framework
2941 # for this (global event?)
2942 %ext::player_env::MUSIC_FACE_CACHE = ();
2943
2944 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2945
2654 warn "loading facedata from $path\n"; 2946 warn "loading facedata from $path\n";
2655 2947
2656 my $facedata; 2948 my $facedata;
2657 0 < aio_load $path, $facedata 2949 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 2950 or die "$path: $!";
… …
2660 $facedata = Coro::Storable::thaw $facedata; 2952 $facedata = Coro::Storable::thaw $facedata;
2661 2953
2662 $facedata->{version} == 2 2954 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 2955 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 2956
2957 # patch in the exptable
2958 $facedata->{resource}{"res/exp_table"} = {
2959 type => FT_RSRC,
2960 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2961 };
2962 cf::cede_to_tick;
2963
2665 { 2964 {
2666 my $faces = $facedata->{faceinfo}; 2965 my $faces = $facedata->{faceinfo};
2667 2966
2668 while (my ($face, $info) = each %$faces) { 2967 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2968 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2969 cf::face::set_visibility $idx, $info->{visibility};
2970 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 2973
2974 cf::cede_to_tick;
2674 } 2975 }
2675 2976
2676 while (my ($face, $info) = each %$faces) { 2977 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2978 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2979 my $idx = cf::face::find $face
2679 or next; 2980 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2981 if (my $smooth = cf::face::find $info->{smooth}) {
2982 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2983 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2984 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2985 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 2986 }
2685 Coro::cede; 2987
2988 cf::cede_to_tick;
2686 } 2989 }
2687 } 2990 }
2688 2991
2689 { 2992 {
2690 my $anims = $facedata->{animinfo}; 2993 my $anims = $facedata->{animinfo};
2691 2994
2692 while (my ($anim, $info) = each %$anims) { 2995 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2996 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 2997 cf::cede_to_tick;
2695 } 2998 }
2696 2999
2697 cf::anim::invalidate_all; # d'oh 3000 cf::anim::invalidate_all; # d'oh
2698 } 3001 }
2699 3002
3003 {
3004 # TODO: for gcfclient pleasure, we should give resources
3005 # that gcfclient doesn't grok a >10000 face index.
3006 my $res = $facedata->{resource};
3007
3008 my $soundconf = delete $res->{"res/sound.conf"};
3009
3010 while (my ($name, $info) = each %$res) {
3011 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data;
3013
3014 if ($info->{type} & 1) {
3015 # prepend meta info
3016
3017 my $meta = $enc->encode ({
3018 name => $name,
3019 %{ $info->{meta} || {} },
3020 });
3021
3022 $data = pack "(w/a*)*", $meta, $info->{data};
3023 } else {
3024 $data = $info->{data};
3025 }
3026
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
3030 cf::cede_to_tick;
3031 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
3050 }
3051
2700 1 3052 1
2701} 3053}
2702 3054
3055register_exticmd fx_want => sub {
3056 my ($ns, $want) = @_;
3057
3058 while (my ($k, $v) = each %$want) {
3059 $ns->fx_want ($k, $v);
3060 }
3061};
3062
2703sub reload_regions { 3063sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = ();
3067
2704 load_resource_file "$MAPDIR/regions" 3068 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 3069 or die "unable to load regions file\n";
3070
3071 for (cf::region::list) {
3072 $_->{match} = qr/$_->{match}/
3073 if exists $_->{match};
3074 }
2706} 3075}
2707 3076
2708sub reload_facedata { 3077sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3078 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3079 or die "unable to load facedata\n";
2711} 3080}
2712 3081
2713sub reload_archetypes { 3082sub reload_archetypes {
3083 load_resource_file "$DATADIR/archetypes"
3084 or die "unable to load archetypes\n";
3085 #d# NEED to laod twice to resolve forward references
3086 # this really needs to be done in an extra post-pass
3087 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 3088 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 3089 or die "unable to load archetypes\n";
2716} 3090}
2717 3091
2718sub reload_treasures { 3092sub reload_treasures {
… …
2734 3108
2735sub init { 3109sub init {
2736 reload_resources; 3110 reload_resources;
2737} 3111}
2738 3112
2739sub cfg_load { 3113sub reload_config {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3114 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3115 or return;
2742 3116
2743 local $/; 3117 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3118 *CFG = YAML::Syck::Load <$fh>;
… …
2764 (async { 3138 (async {
2765 Event::one_event; 3139 Event::one_event;
2766 })->prio (Coro::PRIO_MAX); 3140 })->prio (Coro::PRIO_MAX);
2767 }; 3141 };
2768 3142
2769 cfg_load; 3143 reload_config;
2770 db_init; 3144 db_init;
2771 load_extensions; 3145 load_extensions;
2772 3146
2773 $TICK_WATCHER->start; 3147 $TICK_WATCHER->start;
2774 Event::loop; 3148 Event::loop;
… …
2967 warn "reloading cf.pm"; 3341 warn "reloading cf.pm";
2968 require cf; 3342 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970 3344
2971 warn "loading config and database again"; 3345 warn "loading config and database again";
2972 cf::cfg_load; 3346 cf::reload_config;
2973 3347
2974 warn "loading extensions"; 3348 warn "loading extensions";
2975 cf::load_extensions; 3349 cf::load_extensions;
2976 3350
2977 warn "reattaching attachments to objects/players"; 3351 warn "reattaching attachments to objects/players";
… …
3070 or die; 3444 or die;
3071 3445
3072 $map->width (50); 3446 $map->width (50);
3073 $map->height (50); 3447 $map->height (50);
3074 $map->alloc; 3448 $map->alloc;
3075 $map->_load_objects ("/tmp/x.map", 1); 3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3076 my $t = Event::time - $t; 3450 my $t = Event::time - $t;
3077 3451
3078 #next unless $t < 0.0013;#d# 3452 #next unless $t < 0.0013;#d#
3079 if ($t < $min) { 3453 if ($t < $min) {
3080 $min = $t; 3454 $min = $t;

Diff Legend

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