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.361 by root, Sun Sep 9 12:52:48 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;
… …
1194 1277
1195=head3 cf::player 1278=head3 cf::player
1196 1279
1197=over 4 1280=over 4
1198 1281
1282=item cf::player::num_playing
1283
1284Returns the official number of playing players, as per the Crossfire metaserver rules.
1285
1286=cut
1287
1288sub num_playing {
1289 scalar grep
1290 $_->ob->map
1291 && !$_->hidden
1292 && !$_->ob->flag (cf::FLAG_WIZ),
1293 cf::player::list
1294}
1295
1199=item cf::player::find $login 1296=item cf::player::find $login
1200 1297
1201Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1202 1299
1203=cut 1300=cut
… …
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1339
1243 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1244 or return; 1341 or return;
1342
1343 $f->next;
1344 my $pl = cf::player::load_pl $f
1345 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs;
1245 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1246 } 1349 }
1247 } 1350 }
1248} 1351}
1249 1352
… …
1259 1362
1260 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1262 1365
1263 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1264 Coro::cede; 1367 cf::cede_to_tick;
1265} 1368}
1266 1369
1267sub new($) { 1370sub new($) {
1268 my ($login) = @_; 1371 my ($login) = @_;
1269 1372
… …
1273 $self->{deny_save} = 1; 1376 $self->{deny_save} = 1;
1274 1377
1275 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1276 1379
1277 $self 1380 $self
1381}
1382
1383=item $player->send_msg ($channel, $msg, $color, [extra...])
1384
1385=cut
1386
1387sub send_msg {
1388 my $ns = shift->ns
1389 or return;
1390 $ns->send_msg (@_);
1278} 1391}
1279 1392
1280=item $pl->quit_character 1393=item $pl->quit_character
1281 1394
1282Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
… …
1337 or return []; 1450 or return [];
1338 1451
1339 my @logins; 1452 my @logins;
1340 1453
1341 for my $login (@$dirs) { 1454 for my $login (@$dirs) {
1455 my $path = path $login;
1456
1457 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1345 1463
1346 utf8::decode $login; 1464 utf8::decode $login;
1347 push @logins, $login; 1465 push @logins, $login;
1348 } 1466 }
1349 1467
… …
1387sub expand_cfpod { 1505sub expand_cfpod {
1388 ((my $self), (local $_)) = @_; 1506 ((my $self), (local $_)) = @_;
1389 1507
1390 # escape & and < 1508 # escape & and <
1391 s/&/&amp;/g; 1509 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g; 1510 s/(?<![BIUGHT])</&lt;/g;
1393 1511
1394 # this is buggy, it needs to properly take care of nested <'s 1512 # this is buggy, it needs to properly take care of nested <'s
1395 1513
1396 1 while 1514 1 while
1397 # replace B<>, I<>, U<> etc. 1515 # replace B<>, I<>, U<> etc.
1398 s/B<([^\>]*)>/<b>$1<\/b>/ 1516 s/B<([^\>]*)>/<b>$1<\/b>/
1399 || s/I<([^\>]*)>/<i>$1<\/i>/ 1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1400 || s/U<([^\>]*)>/<u>$1<\/u>/ 1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1401 # replace G<male|female> tags 1520 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1521 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1 1522 $self->gender ? $2 : $1
1404 }ge 1523 }ge
1405 # replace H<hint text> 1524 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1525 || s{H<([^\>]*)>}
1526 {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "")
1530 [$self->{hintmode}]
1531 }ge;
1407 1532
1408 # create single paragraphs (very hackish) 1533 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1534 s/(?<=\S)\n(?=\w)/ /g;
1410 1535
1536 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines
1541
1411 $_ 1542 $_
1412} 1543}
1413 1544
1545sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode}
1548}
1549
1414=item $player->ext_reply ($msgid, %msg) 1550=item $player->ext_reply ($msgid, @msg)
1415 1551
1416Sends an ext reply to the player. 1552Sends an ext reply to the player.
1417 1553
1418=cut 1554=cut
1419 1555
1420sub ext_reply($$%) { 1556sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1557 my ($self, $id, @msg) = @_;
1422 1558
1423 $msg{msgid} = $id; 1559 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1560}
1426 1561
1427=item $player->ext_event ($type, %msg) 1562=item $player->ext_msg ($type, @msg)
1428 1563
1429Sends an ext event to the client. 1564Sends an ext event to the client.
1430 1565
1431=cut 1566=cut
1432 1567
1433sub ext_event($$%) { 1568sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1569 my ($self, $type, @msg) = @_;
1435 1570
1436 $self->ns->ext_event ($type, %msg); 1571 $self->ns->ext_msg ($type, @msg);
1437} 1572}
1438 1573
1439=head3 cf::region 1574=head3 cf::region
1440 1575
1441=over 4 1576=over 4
… …
1454 my ($path) = @_; 1589 my ($path) = @_;
1455 1590
1456 my ($match, $specificity); 1591 my ($match, $specificity);
1457 1592
1458 for my $region (list) { 1593 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1594 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1595 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1596 if $region->specificity > $specificity;
1462 } 1597 }
1463 } 1598 }
1464 1599
… …
1584 $self->init; # pass $1 etc. 1719 $self->init; # pass $1 etc.
1585 return $self; 1720 return $self;
1586 } 1721 }
1587 } 1722 }
1588 1723
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1724 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1725 ()
1591} 1726}
1592 1727
1593sub init { 1728sub init {
1594 my ($self) = @_; 1729 my ($self) = @_;
… …
1657 1792
1658sub load_header_from($) { 1793sub load_header_from($) {
1659 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1660 1795
1661 utf8::encode $path; 1796 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 or return; 1798 or return;
1799
1800 $self->_load_header ($f)
1801 or return;
1802
1803 local $MAP_LOADING{$self->{path}} = $self;
1804 $f->resolve_delayed_derefs;
1667 1805
1668 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1669 1807
1670 1 1808 1
1671} 1809}
… …
1725sub find { 1863sub find {
1726 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1727 1865
1728 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1729 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1730 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1731 1870
1732 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1733 my $guard = cf::lock_acquire "map_find:$path"; 1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1734 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1735 or return; 1876 or return;
1736 1877
1737 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1738 1879
… …
1740 or return; 1881 or return;
1741 1882
1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1744 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1745 $map->reset; 1888 $map->reset;
1746 undef $guard;
1747 return find $path; 1889 return find $path;
1748 } 1890 }
1749 1891
1750 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1751 } 1893 }
… …
1760 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1761 1903
1762 my $path = $self->{path}; 1904 my $path = $self->{path};
1763 1905
1764 { 1906 {
1765 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1766 1908
1909 return unless $self->valid;
1767 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1768 1911
1769 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1770 1913
1771 $self->alloc; 1914 $self->alloc;
1772 1915
1773 $self->pre_load; 1916 $self->pre_load;
1774 Coro::cede; 1917 cf::cede_to_tick;
1775 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1776 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1777 or return; 1922 or return;
1778 1923
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1780 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1781 1926
1782 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 1928 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 1931 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1787 } 1935 }
1788 } 1936 }
1789 1937
1790 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1791 # now do the right thing for maps 1941 # now do the right thing for maps
1792 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 1944 unless $self->difficulty;
1795 Coro::cede; 1945 cf::cede_to_tick;
1796 1946
1797 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 1948 $self->decay_objects;
1799 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1800 $self->update_buttons; 1950 $self->update_buttons;
1801 Coro::cede; 1951 cf::cede_to_tick;
1802 $self->set_darkness_map; 1952 $self->set_darkness_map;
1803 Coro::cede; 1953 cf::cede_to_tick;
1804 $self->activate; 1954 $self->activate;
1805 } 1955 }
1956
1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1806 1959
1807 $self->in_memory (cf::MAP_IN_MEMORY); 1960 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 1961 }
1809 1962
1810 $self->post_load; 1963 $self->post_load;
… …
1821 1974
1822 $self 1975 $self
1823} 1976}
1824 1977
1825# find and load all maps in the 3x3 area around a map 1978# find and load all maps in the 3x3 area around a map
1826sub load_diag { 1979sub load_neighbours {
1827 my ($map) = @_; 1980 my ($map) = @_;
1828 1981
1829 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1830 1983
1831 for (0 .. 3) { 1984 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1833 or next; 1986 or next;
1834 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1835 or next; 1988 or next;
1836 $neigh->load; 1989 $neigh->load;
1837 1990
1991 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 1994 }
1841 1995
1842 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1844 or next; 1999 or next;
1845 $neigh->load; 2000 $neigh->load;
1846 } 2001 }
1847} 2002}
1848 2003
… …
1853} 2008}
1854 2009
1855sub do_load_sync { 2010sub do_load_sync {
1856 my ($map) = @_; 2011 my ($map) = @_;
1857 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1858 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1859} 2017}
1860 2018
1861our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1863 2021
1864sub find_async { 2022sub find_async {
1865 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1866 2024
1867 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1868 2026
1869 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871 } 2029 }
1872 2030
1873 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1874 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2036 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2037 $map->load if $v;
2038 }
1880 2039
1881 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
1882 } 2041 }
1883 } 2042 }
1884 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
1885 }; 2044 };
1886 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
… …
1889} 2048}
1890 2049
1891sub save { 2050sub save {
1892 my ($self) = @_; 2051 my ($self) = @_;
1893 2052
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 2054
1896 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1897 2056
1898 return unless $self->dirty; 2057 return unless $self->dirty;
1899 2058
… …
1922 my ($self) = @_; 2081 my ($self) = @_;
1923 2082
1924 # save first because save cedes 2083 # save first because save cedes
1925 $self->save; 2084 $self->save;
1926 2085
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2087
1929 return if $self->players; 2088 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
1931 return if $self->{deny_save}; 2090 return if $self->{deny_save};
1932 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
1933 $self->clear; 2096 $self->clear;
1934 $self->in_memory (cf::MAP_SWAPPED);
1935} 2097}
1936 2098
1937sub reset_at { 2099sub reset_at {
1938 my ($self) = @_; 2100 my ($self) = @_;
1939 2101
… …
1971 if $uniq; 2133 if $uniq;
1972 } 2134 }
1973 2135
1974 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
1975 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
1976 $self->clear; 2140 $self->clear;
1977
1978 $_->clear_links_to ($self) for values %cf::MAP;
1979 2141
1980 $self->unlink_save; 2142 $self->unlink_save;
1981 $self->destroy; 2143 $self->destroy;
1982} 2144}
1983 2145
1984my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
1985 2147
1986sub nuke { 2148sub nuke {
1987 my ($self) = @_; 2149 my ($self) = @_;
1988 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
1989 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
1990 2155
1991 $self->unlink_save; 2156 $self->unlink_save;
1992 2157
1993 bless $self, "cf::map"; 2158 bless $self, "cf::map";
1994 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2163
1999 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
2000 2166
2001 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2002} 2168}
2003 2169
2004=item $maps = cf::map::tmp_maps 2170=item $maps = cf::map::tmp_maps
… …
2080 2246
2081sub inv_recursive { 2247sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2083} 2249}
2084 2250
2251=item $ref = $ob->ref
2252
2253creates and returns a persistent reference to an objetc that can be stored as a string.
2254
2255=item $ob = cf::object::deref ($refstring)
2256
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block.
2259
2260=cut
2261
2262sub deref {
2263 my ($ref) = @_;
2264
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return;
2272 $pl->ob->uuid eq $uuid
2273 or return;
2274
2275 $pl->ob
2276 } else {
2277 warn "$ref: cannot resolve object reference\n";
2278 undef
2279 }
2280}
2281
2085package cf; 2282package cf;
2086 2283
2087=back 2284=back
2088 2285
2089=head3 cf::object::player 2286=head3 cf::object::player
… …
2111 2308
2112 } else { 2309 } else {
2113 my $pl = $self->contr; 2310 my $pl = $self->contr;
2114 2311
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2312 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2313 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2314 $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 2315
2124 } else { 2316 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2317 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2127 } 2319 }
2128 } 2320 }
2321}
2322
2323=item $object->send_msg ($channel, $msg, $color, [extra...])
2324
2325=cut
2326
2327sub cf::object::send_msg {
2328 my $pl = shift->contr
2329 or return;
2330 $pl->send_msg (@_);
2129} 2331}
2130 2332
2131=item $player_object->may ("access") 2333=item $player_object->may ("access")
2132 2334
2133Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
… …
2212 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
2215 2417
2216 $map->load; 2418 $map->load;
2217 $map->load_diag; 2419 $map->load_neighbours;
2218 2420
2219 return unless $self->contr->active; 2421 return unless $self->contr->active;
2220 $self->activate_recursive; 2422 $self->activate_recursive;
2221 2423
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2425 $self->enter_map ($map, $x, $y);
2224} 2426}
2225 2427
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2428=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2429
2228Moves the player to the given map-path and coordinates by first freezing 2430Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2431her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2432that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2433the new (success) or old (failed) map position. In either case, $done will
2434be called at the end of this process.
2232 2435
2233=cut 2436=cut
2234 2437
2235our $GOTOGEN; 2438our $GOTOGEN;
2236 2439
2237sub cf::object::player::goto { 2440sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2441 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2442
2240 # do generation counting so two concurrent goto's will be executed in-order 2443 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2445
2243 $self->enter_link; 2446 $self->enter_link;
… …
2263 2466
2264 if ($gen == $self->{_goto_generation}) { 2467 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2468 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2469 $self->leave_link ($map, $x, $y);
2267 } 2470 }
2471
2472 $done->() if $done;
2268 })->prio (1); 2473 })->prio (1);
2269} 2474}
2270 2475
2271=item $player_object->enter_exit ($exit_object) 2476=item $player_object->enter_exit ($exit_object)
2272 2477
… …
2341 my $hp = $exit->stats->hp; 2546 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2547 my $sp = $exit->stats->sp;
2343 2548
2344 $self->enter_link; 2549 $self->enter_link;
2345 2550
2551 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED);
2554
2346 (async { 2555 (async {
2347 $self->deactivate_recursive; # just to be sure 2556 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2557 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2558 $self->goto ($slaying, $hp, $sp);
2350 2559
… …
2377 2586
2378 utf8::encode $text; 2587 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2588 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2589}
2381 2590
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2591=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2592
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2593Send 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 2594client 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 2595the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2596the message unless the client supports the msg packet.
2388 2597
2389=cut 2598=cut
2390 2599
2600our %CHANNEL = (
2601 "c/identify" => {
2602 id => "identify",
2603 title => "Identify",
2604 reply => undef,
2605 tooltip => "Items recently identified",
2606 },
2607 "c/examine" => {
2608 id => "examine",
2609 title => "Examine",
2610 reply => undef,
2611 tooltip => "Signs and other items you examined",
2612 },
2613);
2614
2391sub cf::client::send_msg { 2615sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2616 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2617
2394 $msg = $self->pl->expand_cfpod ($msg); 2618 $msg = $self->pl->expand_cfpod ($msg);
2395 2619
2620 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621
2622 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2624
2625 if (ref $channel) {
2626 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2631 }
2632
2633 $channel = $channel->{id};
2634 }
2635
2636 return unless @extra || length $msg;
2637
2396 if ($self->can_msg) { 2638 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2639 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF;
2642
2643 $self->send_packet ("msg " . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2645 } 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) { 2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656
2657 $color &= cf::NDI_COLOR_MASK;
2658
2659 utf8::encode $msg;
2660
2410 if (0 && $msg =~ /\[/) { 2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2664 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2666 $self->send_packet ("drawinfo $color $msg")
2415 } 2667 }
2416 } 2668 }
2417 } 2669 }
2418} 2670}
2419 2671
2420=item $client->ext_event ($type, %msg) 2672=item $client->ext_msg ($type, @msg)
2421 2673
2422Sends an ext event to the client. 2674Sends an ext event to the client.
2423 2675
2424=cut 2676=cut
2425 2677
2426sub cf::client::ext_event($$%) { 2678sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2679 my ($self, $type, @msg) = @_;
2428 2680
2681 if ($self->extcmd == 2) {
2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2684 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 }
2687}
2688
2689=item $client->ext_reply ($msgid, @msg)
2690
2691Sends an ext reply to the client.
2692
2693=cut
2694
2695sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_;
2697
2698 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 }
2431} 2705}
2432 2706
2433=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
2434 2708
2435Queues a query to the client, calling the given callback with 2709Queues a query to the client, calling the given callback with
… …
2458 2732
2459 1 2733 1
2460} 2734}
2461 2735
2462cf::client->attach ( 2736cf::client->attach (
2737 on_connect => sub {
2738 my ($ns) = @_;
2739
2740 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2741 },
2463 on_reply => sub { 2742 on_reply => sub {
2464 my ($ns, $msg) = @_; 2743 my ($ns, $msg) = @_;
2465 2744
2466 # this weird shuffling is so that direct followup queries 2745 # this weird shuffling is so that direct followup queries
2467 # get handled first 2746 # get handled first
… …
2482 } 2761 }
2483 }, 2762 },
2484 on_exticmd => sub { 2763 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2764 my ($ns, $buf) = @_;
2486 2765
2487 my $msg = eval { from_json $buf }; 2766 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2767
2489 if (ref $msg) { 2768 if (ref $msg) {
2769 my ($type, $reply, @payload) =
2770 "ARRAY" eq ref $msg
2771 ? @$msg
2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2773
2774 my @reply;
2775
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2776 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2777 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2496 } else { 2783 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2784 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2785 }
2499 2786
2500 cf::override; 2787 cf::override;
… …
2547our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
2549 2836
2550$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2551 2838
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2839$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math
2841 grepstart grepwhile mapstart mapwhile
2842 sort time
2843));
2553 2844
2554# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2555 2846
2556=pod 2847=pod
2557 2848
2558The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2559 2850
2560 cf::object contr pay_amount pay_player map 2851 cf::object
2852 contr pay_amount pay_player map x y force_find force_add
2853 insert remove name archname title slaying race decrease_ob_nr
2854
2561 cf::object::player player 2855 cf::object::player
2562 cf::player peaceful 2856 player
2563 cf::map trigger 2857
2858 cf::player
2859 peaceful
2860
2861 cf::map
2862 trigger
2564 2863
2565=cut 2864=cut
2566 2865
2567for ( 2866for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race
2869 decrease_ob_nr)],
2569 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2572) { 2873) {
2573 no strict 'refs'; 2874 no strict 'refs';
… …
2649# the server's init and main functions 2950# the server's init and main functions
2650 2951
2651sub load_facedata($) { 2952sub load_facedata($) {
2652 my ($path) = @_; 2953 my ($path) = @_;
2653 2954
2955 # HACK to clear player env face cache, we need some signal framework
2956 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = ();
2958
2959 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2960
2654 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2655 2962
2656 my $facedata; 2963 my $facedata;
2657 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 2965 or die "$path: $!";
… …
2660 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2661 2968
2662 $facedata->{version} == 2 2969 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 2970 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 2971
2972 # patch in the exptable
2973 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC,
2975 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2976 };
2977 cf::cede_to_tick;
2978
2665 { 2979 {
2666 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2667 2981
2668 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 2988
2989 cf::cede_to_tick;
2674 } 2990 }
2675 2991
2676 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2993 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2994 my $idx = cf::face::find $face
2679 or next; 2995 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2996 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2999 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3000 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 3001 }
2685 Coro::cede; 3002
3003 cf::cede_to_tick;
2686 } 3004 }
2687 } 3005 }
2688 3006
2689 { 3007 {
2690 my $anims = $facedata->{animinfo}; 3008 my $anims = $facedata->{animinfo};
2691 3009
2692 while (my ($anim, $info) = each %$anims) { 3010 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3011 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 3012 cf::cede_to_tick;
2695 } 3013 }
2696 3014
2697 cf::anim::invalidate_all; # d'oh 3015 cf::anim::invalidate_all; # d'oh
2698 } 3016 }
2699 3017
3018 {
3019 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource};
3022
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
3028
3029 if ($info->{type} & 1) {
3030 # prepend meta info
3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
3037 $data = pack "(w/a*)*", $meta, $info->{data};
3038 } else {
3039 $data = $info->{data};
3040 }
3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick;
3046 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 }
3066
2700 1 3067 1
2701} 3068}
2702 3069
3070register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_;
3072
3073 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v);
3075 }
3076};
3077
2703sub reload_regions { 3078sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = ();
3082
2704 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 3084 or die "unable to load regions file\n";
3085
3086 for (cf::region::list) {
3087 $_->{match} = qr/$_->{match}/
3088 if exists $_->{match};
3089 }
2706} 3090}
2707 3091
2708sub reload_facedata { 3092sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3093 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3094 or die "unable to load facedata\n";
2711} 3095}
2712 3096
2713sub reload_archetypes { 3097sub reload_archetypes {
3098 load_resource_file "$DATADIR/archetypes"
3099 or die "unable to load archetypes\n";
3100 #d# NEED to laod twice to resolve forward references
3101 # this really needs to be done in an extra post-pass
3102 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 3103 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 3104 or die "unable to load archetypes\n";
2716} 3105}
2717 3106
2718sub reload_treasures { 3107sub reload_treasures {
… …
2734 3123
2735sub init { 3124sub init {
2736 reload_resources; 3125 reload_resources;
2737} 3126}
2738 3127
2739sub cfg_load { 3128sub reload_config {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3130 or return;
2742 3131
2743 local $/; 3132 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
… …
2764 (async { 3153 (async {
2765 Event::one_event; 3154 Event::one_event;
2766 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
2767 }; 3156 };
2768 3157
2769 cfg_load; 3158 reload_config;
2770 db_init; 3159 db_init;
2771 load_extensions; 3160 load_extensions;
2772 3161
2773 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
2774 Event::loop; 3163 Event::loop;
… …
2967 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
2968 require cf; 3357 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970 3359
2971 warn "loading config and database again"; 3360 warn "loading config and database again";
2972 cf::cfg_load; 3361 cf::reload_config;
2973 3362
2974 warn "loading extensions"; 3363 warn "loading extensions";
2975 cf::load_extensions; 3364 cf::load_extensions;
2976 3365
2977 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
… …
3070 or die; 3459 or die;
3071 3460
3072 $map->width (50); 3461 $map->width (50);
3073 $map->height (50); 3462 $map->height (50);
3074 $map->alloc; 3463 $map->alloc;
3075 $map->_load_objects ("/tmp/x.map", 1); 3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3076 my $t = Event::time - $t; 3465 my $t = Event::time - $t;
3077 3466
3078 #next unless $t < 0.0013;#d# 3467 #next unless $t < 0.0013;#d#
3079 if ($t < $min) { 3468 if ($t < $min) {
3080 $min = $t; 3469 $min = $t;

Diff Legend

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