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.269 by root, Tue May 22 21:35:26 2007 UTC vs.
Revision 1.364 by root, Tue Sep 11 08:41:11 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
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
76our $NEXT_TICK; 80our $NEXT_TICK;
77our $NOW; 81our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
79 83
80our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 87our $DB_ENV;
82 88
83our %CFG; 89our %CFG;
84 90
85our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 92our $RUNTIME;
87 93
88our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
91 97
92# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 100
164 170
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 172returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 173per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 174
175=item @cf::INVOKE_RESULTS
176
177This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call.
180
169=back 181=back
170 182
171=cut 183=cut
172 184
173BEGIN { 185BEGIN {
177 $msg .= "\n" 189 $msg .= "\n"
178 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
179 191
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 193
182 utf8::encode $msg;
183 LOG llevError, $msg; 194 LOG llevError, $msg;
184 }; 195 };
185} 196}
186 197
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 202@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
203@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 204@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 205
194# we bless all objects into (empty) derived classes to force a method lookup 206# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 207# within the Safe compartment.
196for my $pkg (qw( 208for my $pkg (qw(
197 cf::global cf::attachable 209 cf::global cf::attachable
205} 217}
206 218
207$Event::DIED = sub { 219$Event::DIED = sub {
208 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
209}; 221};
222
223#############################################################################
210 224
211=head2 UTILITY FUNCTIONS 225=head2 UTILITY FUNCTIONS
212 226
213=over 4 227=over 4
214 228
233 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
234 $d 248 $d
235 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
236} 250}
237 251
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 252=item $ref = cf::from_json $json
241 253
242Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
243 255
244=item $json = cf::to_json $ref 256=item $json = cf::to_json $ref
245 257
246Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
259
260=cut
261
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263
264sub to_json ($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) }
247 266
248=item cf::lock_wait $string 267=item cf::lock_wait $string
249 268
250Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
251 270
254Wait until the given lock is available and then acquires it and returns 273Wait until the given lock is available and then acquires it and returns
255a Coro::guard object. If the guard object gets destroyed (goes out of scope, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
256for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
257returned. 276returned.
258 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
259Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
260uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
261 283
262=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
263 285
264Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
265 287
266=cut 288=cut
267 289
268our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
269 292
270sub lock_wait($) { 293sub lock_wait($) {
271 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
272 300
273 # wait for lock, if any 301 # wait for lock, if any
274 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule; 304 Coro::schedule;
282 310
283 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
284 lock_wait $key; 312 lock_wait $key;
285 313
286 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
287 316
288 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
289 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
291 } 321 }
292} 322}
293 323
305 }; 335 };
306 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
307 $guard 337 $guard
308} 338}
309 339
340=item cf::get_slot $time[, $priority[, $name]]
341
342Allocate $time seconds of blocking CPU time at priority C<$priority>:
343This call blocks and returns only when you have at least C<$time> seconds
344of cpu time till the next tick. The slot is only valid till the next cede.
345
346The optional C<$name> can be used to identify the job to run. It might be
347used for statistical purposes and should identify the same time-class.
348
349Useful for short background jobs.
350
351=cut
352
353our @SLOT_QUEUE;
354our $SLOT_QUEUE;
355
356$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async {
358 my $signal = new Coro::Signal;
359
360 while () {
361 next_job:
362 my $avail = cf::till_tick;
363 if ($avail > 0.01) {
364 for (0 .. $#SLOT_QUEUE) {
365 if ($SLOT_QUEUE[$_][0] < $avail) {
366 my $job = splice @SLOT_QUEUE, $_, 1, ();
367 $job->[2]->send;
368 Coro::cede;
369 goto next_job;
370 }
371 }
372 }
373
374 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait;
378 } else {
379 Coro::schedule;
380 }
381 }
382};
383
384sub get_slot($;$$) {
385 my ($time, $pri, $name) = @_;
386
387 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal;
389
390 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392 $SLOT_QUEUE->ready;
393 $sig->wait;
394}
395
310=item cf::async { BLOCK } 396=item cf::async { BLOCK }
311 397
312Currently the same as Coro::async_pool, meaning you cannot use 398Currently the same as Coro::async_pool, meaning you cannot use
313C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 399C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
314thing you are allowed to do is call C<prio> on it. 400thing you are allowed to do is call C<prio> on it.
317 403
318BEGIN { *async = \&Coro::async_pool } 404BEGIN { *async = \&Coro::async_pool }
319 405
320=item cf::sync_job { BLOCK } 406=item cf::sync_job { BLOCK }
321 407
322The design of crossfire+ requires that the main coro ($Coro::main) is 408The design of Crossfire TRT requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 409is always able to handle events or runnable, as Crossfire TRT is only
324reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable.
325 412
326If it must be done, put the blocking parts into C<sync_job>. This will run 413If it must be done, put the blocking parts into C<sync_job>. This will run
327the given BLOCK in another coroutine while waiting for the result. The 414the given BLOCK in another coroutine while waiting for the result. The
328server will be frozen during this time, so the block should either finish 415server will be frozen during this time, so the block should either finish
329fast or be very important. 416fast or be very important.
389 $EXT_CORO{$coro+0} = $coro; 476 $EXT_CORO{$coro+0} = $coro;
390 477
391 $coro 478 $coro
392} 479}
393 480
394sub write_runtime { 481=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 482
397 # first touch the runtime file to show we are still running: 483Executes the given code block with the given arguments in a seperate
398 # the fsync below can take a very very long time. 484process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling.
399 487
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 488=cut
401 utime undef, undef, $fh; 489
490sub fork_call(&@) {
491 my ($cb, @args) = @_;
492
493 # we seemingly have to make a local copy of the whole thing,
494 # otherwise perl prematurely frees the stuff :/
495 # TODO: investigate and fix (likely this will be rather laborious)
496
497 my @res = Coro::Util::fork_eval {
498 reset_signals;
499 &$cb
500 }, @args;
501
502 wantarray ? @res : $res[-1]
503}
504
505=item $value = cf::db_get $family => $key
506
507Returns a single value from the environment database.
508
509=item cf::db_put $family => $key => $value
510
511Stores the given C<$value> in the family. It can currently store binary
512data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
513
514=item $db = cf::db_table "name"
515
516Create and/or open a new database table. The string must not be "db" and must be unique
517within each server.
518
519=cut
520
521sub db_table($) {
522 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV;
524
525 eval {
526 $db->set_flags (BDB::CHKSUM);
527
528 utf8::encode $name;
529 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
530 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
531 cf::cleanup "db_open(db): $!" if $!;
402 } 532 };
533 cf::cleanup "db_open(db): $@" if $@;
403 534
404 my $guard = cf::lock_acquire "write_runtime"; 535 $db
536}
405 537
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 538our $DB;
407 or return;
408 539
409 my $value = $cf::RUNTIME + 90 + 10; 540sub db_init {
410 # 10 is the runtime save interval, for a monotonic clock 541 cf::sync_job {
411 # 60 allows for the watchdog to kill the server. 542 $DB ||= db_table "db";
543 };
544}
412 545
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 546sub db_get($$) {
414 and return; 547 my $key = "$_[0]/$_[1]";
415 548
416 # always fsync - this file is important 549 cf::sync_job {
417 aio_fsync $fh 550 BDB::db_get $DB, undef, $key, my $data;
418 and return;
419 551
420 # touch it again to show we are up-to-date 552 $! ? ()
421 utime undef, undef, $fh; 553 : $data
422
423 close $fh
424 or return;
425
426 aio_rename "$runtime~", $runtime
427 and return;
428
429 warn "runtime file written.\n";#d#
430
431 1 554 }
555}
556
557sub db_put($$$) {
558 BDB::dbreq_pri 4;
559 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
560}
561
562=item cf::cache $id => [$paths...], $processversion => $process
563
564Generic caching function that returns the value of the resource $id,
565caching and regenerating as required.
566
567This function can block.
568
569=cut
570
571sub cache {
572 my ($id, $src, $processversion, $process) = @_;
573
574 my $meta =
575 join "\x00",
576 $processversion,
577 map {
578 aio_stat $_
579 and Carp::croak "$_: $!";
580
581 ($_, (stat _)[7,9])
582 } @$src;
583
584 my $dbmeta = db_get cache => "$id/meta";
585 if ($dbmeta ne $meta) {
586 # changed, we may need to process
587
588 my @data;
589 my $md5;
590
591 for (0 .. $#$src) {
592 0 <= aio_load $src->[$_], $data[$_]
593 or Carp::croak "$src->[$_]: $!";
594 }
595
596 # if processing is expensive, check
597 # checksum first
598 if (1) {
599 $md5 =
600 join "\x00",
601 $processversion,
602 map {
603 cf::cede_to_tick;
604 ($src->[$_], Digest::MD5::md5_hex $data[$_])
605 } 0.. $#$src;
606
607
608 my $dbmd5 = db_get cache => "$id/md5";
609 if ($dbmd5 eq $md5) {
610 db_put cache => "$id/meta", $meta;
611
612 return db_get cache => "$id/data";
613 }
614 }
615
616 my $t1 = Time::HiRes::time;
617 my $data = $process->(\@data);
618 my $t2 = Time::HiRes::time;
619
620 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
621
622 db_put cache => "$id/data", $data;
623 db_put cache => "$id/md5" , $md5;
624 db_put cache => "$id/meta", $meta;
625
626 return $data;
627 }
628
629 db_get cache => "$id/data"
432} 630}
433 631
434=item cf::datalog type => key => value, ... 632=item cf::datalog type => key => value, ...
435 633
436Log a datalog packet of the given type with the given key-value pairs. 634Log a datalog packet of the given type with the given key-value pairs.
454attach callbacks/event handlers (a collection of which is called an "attachment") 652attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 653to it. All such attachable objects support the following methods.
456 654
457In the following description, CLASS can be any of C<global>, C<object> 655In the following description, CLASS can be any of C<global>, C<object>
458C<player>, C<client> or C<map> (i.e. the attachable objects in 656C<player>, C<client> or C<map> (i.e. the attachable objects in
459crossfire+). 657Crossfire TRT).
460 658
461=over 4 659=over 4
462 660
463=item $attachable->attach ($attachment, key => $value...) 661=item $attachable->attach ($attachment, key => $value...)
464 662
666 _attach $registry, $klass, @attach; 864 _attach $registry, $klass, @attach;
667 } 865 }
668 866
669 $obj->{$name} = \%arg; 867 $obj->{$name} = \%arg;
670 } else { 868 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 869 warn "object uses attachment '$name' which is not available, postponing.\n";
672 } 870 }
673 871
674 $obj->{_attachment}{$name} = undef; 872 $obj->{_attachment}{$name} = undef;
675} 873}
676 874
716 "; 914 ";
717 die if $@; 915 die if $@;
718} 916}
719 917
720our $override; 918our $override;
721our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 919our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
722 920
723sub override { 921sub override {
724 $override = 1; 922 $override = 1;
725 @invoke_results = (); 923 @INVOKE_RESULTS = (@_);
726} 924}
727 925
728sub do_invoke { 926sub do_invoke {
729 my $event = shift; 927 my $event = shift;
730 my $callbacks = shift; 928 my $callbacks = shift;
731 929
732 @invoke_results = (); 930 @INVOKE_RESULTS = ();
733 931
734 local $override; 932 local $override;
735 933
736 for (@$callbacks) { 934 for (@$callbacks) {
737 eval { &{$_->[1]} }; 935 eval { &{$_->[1]} };
754 952
755Generate an object-specific event with the given arguments. 953Generate an object-specific event with the given arguments.
756 954
757This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 955This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
758removed in future versions), and there is no public API to access override 956removed in future versions), and there is no public API to access override
759results (if you must, access C<@cf::invoke_results> directly). 957results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760 958
761=back 959=back
762 960
763=cut 961=cut
764 962
765############################################################################# 963#############################################################################
766# object support 964# object support
965#
966
967sub _can_merge {
968 my ($ob1, $ob2) = @_;
969
970 local $Storable::canonical = 1;
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973
974 $fob1 eq $fob2
975}
767 976
768sub reattach { 977sub reattach {
769 # basically do the same as instantiate, without calling instantiate 978 # basically do the same as instantiate, without calling instantiate
770 my ($obj) = @_; 979 my ($obj) = @_;
771 980
816); 1025);
817 1026
818sub object_freezer_save { 1027sub object_freezer_save {
819 my ($filename, $rdata, $objs) = @_; 1028 my ($filename, $rdata, $objs) = @_;
820 1029
1030 my $guard = cf::lock_acquire "io";
1031
821 sync_job { 1032 sync_job {
822 if (length $$rdata) { 1033 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename);
823 warn sprintf "saving %s (%d,%d)\n", 1035 warn sprintf "saving %s (%d,%d)\n",
824 $filename, length $$rdata, scalar @$objs; 1036 $decname, length $$rdata, scalar @$objs;
825 1037
826 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
827 chmod SAVE_MODE, $fh; 1039 chmod SAVE_MODE, $fh;
828 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
829 aio_fsync $fh if $cf::USE_FSYNC; 1041 aio_fsync $fh if $cf::USE_FSYNC;
848 } 1060 }
849 } else { 1061 } else {
850 aio_unlink $filename; 1062 aio_unlink $filename;
851 aio_unlink "$filename.pst"; 1063 aio_unlink "$filename.pst";
852 } 1064 }
853 } 1065 };
1066
1067 undef $guard;
854} 1068}
855 1069
856sub object_freezer_as_string { 1070sub object_freezer_as_string {
857 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
858 1072
863 1077
864sub object_thawer_load { 1078sub object_thawer_load {
865 my ($filename) = @_; 1079 my ($filename) = @_;
866 1080
867 my ($data, $av); 1081 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
868 1084
869 (aio_load $filename, $data) >= 0 1085 (aio_load $filename, $data) >= 0
870 or return; 1086 or return;
871 1087
872 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
873 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
874 or return; 1090 or return;
1091
1092 undef $guard;
875 $av = eval { (Storable::thaw $av)->{objs} }; 1093 $av = eval { (Storable::thaw $av)->{objs} };
876 } 1094 }
877 1095
1096 utf8::decode (my $decname = $filename);
878 warn sprintf "loading %s (%d)\n", 1097 warn sprintf "loading %s (%d,%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1098 $decname, length $data, scalar @{$av || []};
1099
880 return ($data, $av); 1100 ($data, $av)
881} 1101}
1102
1103=head2 COMMAND CALLBACKS
1104
1105=over 4
1106
1107=cut
882 1108
883############################################################################# 1109#############################################################################
884# command handling &c 1110# command handling &c
885 1111
886=item cf::register_command $name => \&callback($ob,$args); 1112=item cf::register_command $name => \&callback($ob,$args);
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1125 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1126}
901 1127
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1128=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1129
904Register a callbackf ro execution when the client sends an extcmd packet. 1130Register a callback for execution when the client sends an (synchronous)
1131extcmd packet. Ext commands will be processed in the order they are
1132received by the server, like other user commands. The first argument is
1133the logged-in player. Ext commands can only be processed after a player
1134has logged in successfully.
905 1135
906If the callback returns something, it is sent back as if reply was being 1136If the callback returns something, it is sent back as if reply was being
907called. 1137called.
908 1138
1139=item cf::register_exticmd $name => \&callback($ns,$packet);
1140
1141Register a callback for execution when the client sends an (asynchronous)
1142exticmd packet. Exti commands are processed by the server as soon as they
1143are received, i.e. out of order w.r.t. other commands. The first argument
1144is a client socket. Exti commands can be received anytime, even before
1145log-in.
1146
1147If the callback returns something, it is sent back as if reply was being
1148called.
1149
909=cut 1150=cut
910 1151
911sub register_extcmd { 1152sub register_extcmd {
912 my ($name, $cb) = @_; 1153 my ($name, $cb) = @_;
913 1154
914 $EXTCMD{$name} = $cb; 1155 $EXTCMD{$name} = $cb;
1156}
1157
1158sub register_exticmd {
1159 my ($name, $cb) = @_;
1160
1161 $EXTICMD{$name} = $cb;
915} 1162}
916 1163
917cf::player->attach ( 1164cf::player->attach (
918 on_command => sub { 1165 on_command => sub {
919 my ($pl, $name, $params) = @_; 1166 my ($pl, $name, $params) = @_;
928 cf::override; 1175 cf::override;
929 }, 1176 },
930 on_extcmd => sub { 1177 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1178 my ($pl, $buf) = @_;
932 1179
933 my $msg = eval { from_json $buf }; 1180 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1181
935 if (ref $msg) { 1182 if (ref $msg) {
1183 my ($type, $reply, @payload) =
1184 "ARRAY" eq ref $msg
1185 ? @$msg
1186 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1187
1188 my @reply;
1189
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1190 if (my $cb = $EXTCMD{$type}) {
937 if (my %reply = $cb->($pl, $msg)) { 1191 @reply = $cb->($pl, @payload);
938 $pl->ext_reply ($msg->{msgid}, %reply);
939 }
940 } 1192 }
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196
941 } else { 1197 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 } 1199 }
944 1200
945 cf::override; 1201 cf::override;
946 }, 1202 },
947); 1203);
948 1204
949sub load_extension {
950 my ($path) = @_;
951
952 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
953 my $base = $1;
954 my $pkg = $1;
955 $pkg =~ s/[^[:word:]]/_/g;
956 $pkg = "ext::$pkg";
957
958 warn "... loading '$path' into '$pkg'\n";
959
960 open my $fh, "<:utf8", $path
961 or die "$path: $!";
962
963 my $source =
964 "package $pkg; use strict; use utf8;\n"
965 . "#line 1 \"$path\"\n{\n"
966 . (do { local $/; <$fh> })
967 . "\n};\n1";
968
969 unless (eval $source) {
970 my $msg = $@ ? "$path: $@\n"
971 : "extension disabled.\n";
972 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
973 warn $@;
974 warn "mandatory extension failed to load, exiting.\n";
975 exit 1;
976 }
977 die $@;
978 }
979
980 push @EXTS, $pkg;
981}
982
983sub load_extensions { 1205sub load_extensions {
1206 cf::sync_job {
1207 my %todo;
1208
984 for my $ext (<$LIBDIR/*.ext>) { 1209 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1210 next unless -r $path;
986 eval { 1211
987 load_extension $ext; 1212 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1213 my $base = $1;
1214 my $pkg = $1;
1215 $pkg =~ s/[^[:word:]]/_/g;
1216 $pkg = "ext::$pkg";
1217
1218 open my $fh, "<:utf8", $path
1219 or die "$path: $!";
1220
1221 my $source = do { local $/; <$fh> };
1222
1223 my %ext = (
1224 path => $path,
1225 base => $base,
1226 pkg => $pkg,
1227 );
1228
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231
1232 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n"
1235 . $source
1236 . "\n};\n1";
1237
1238 $todo{$base} = \%ext;
1239 }
1240
1241 my %done;
1242 while (%todo) {
1243 my $progress;
1244
1245 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip
1248 unless exists $done{$_};
1249 }
1250
1251 warn "... loading '$k' into '$v->{pkg}'\n";
1252
1253 unless (eval $v->{source}) {
1254 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n";
1256
1257 if (exists $v->{meta}{mandatory}) {
1258 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n";
1260 exit 1;
1261 }
1262
1263 warn $msg;
1264 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
988 1 1269 }
989 } or warn "$ext not loaded: $@"; 1270
1271 skip:
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1273 unless $progress;
1274 }
990 } 1275 };
991} 1276}
992 1277
993############################################################################# 1278#############################################################################
994 1279
1280=back
1281
995=head2 CORE EXTENSIONS 1282=head2 CORE EXTENSIONS
996 1283
997Functions and methods that extend core crossfire objects. 1284Functions and methods that extend core crossfire objects.
998 1285
999=cut 1286=cut
1003use Coro::AIO; 1290use Coro::AIO;
1004 1291
1005=head3 cf::player 1292=head3 cf::player
1006 1293
1007=over 4 1294=over 4
1295
1296=item cf::player::num_playing
1297
1298Returns the official number of playing players, as per the Crossfire metaserver rules.
1299
1300=cut
1301
1302sub num_playing {
1303 scalar grep
1304 $_->ob->map
1305 && !$_->hidden
1306 && !$_->ob->flag (cf::FLAG_WIZ),
1307 cf::player::list
1308}
1008 1309
1009=item cf::player::find $login 1310=item cf::player::find $login
1010 1311
1011Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1012 1313
1048 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1349 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1350 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1351 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051 aio_unlink +(playerdir $login) . "/$login.pl"; 1352 aio_unlink +(playerdir $login) . "/$login.pl";
1052 1353
1053 my $pl = load_pl path $login 1354 my $f = new_from_file cf::object::thawer path $login
1054 or return; 1355 or return;
1356
1357 $f->next;
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1055 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1056 } 1363 }
1057 } 1364 }
1058} 1365}
1059 1366
1069 1376
1070 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1071 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1072 1379
1073 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1074 Coro::cede; 1381 cf::cede_to_tick;
1075} 1382}
1076 1383
1077sub new($) { 1384sub new($) {
1078 my ($login) = @_; 1385 my ($login) = @_;
1079 1386
1083 $self->{deny_save} = 1; 1390 $self->{deny_save} = 1;
1084 1391
1085 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1086 1393
1087 $self 1394 $self
1395}
1396
1397=item $player->send_msg ($channel, $msg, $color, [extra...])
1398
1399=cut
1400
1401sub send_msg {
1402 my $ns = shift->ns
1403 or return;
1404 $ns->send_msg (@_);
1088} 1405}
1089 1406
1090=item $pl->quit_character 1407=item $pl->quit_character
1091 1408
1092Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
1147 or return []; 1464 or return [];
1148 1465
1149 my @logins; 1466 my @logins;
1150 1467
1151 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1152 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1153 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1154 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1155 1477
1156 utf8::decode $login; 1478 utf8::decode $login;
1157 push @logins, $login; 1479 push @logins, $login;
1158 } 1480 }
1159 1481
1186 } 1508 }
1187 1509
1188 \@paths 1510 \@paths
1189} 1511}
1190 1512
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1514
1515Expand crossfire pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563
1191=item $player->ext_reply ($msgid, %msg) 1564=item $player->ext_reply ($msgid, @msg)
1192 1565
1193Sends an ext reply to the player. 1566Sends an ext reply to the player.
1194 1567
1195=cut 1568=cut
1196 1569
1197sub ext_reply($$%) { 1570sub ext_reply($$@) {
1198 my ($self, $id, %msg) = @_; 1571 my ($self, $id, @msg) = @_;
1199 1572
1200 $msg{msgid} = $id; 1573 $self->ns->ext_reply ($id, @msg)
1201
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1574}
1204 1575
1205=item $player->ext_event ($type, %msg) 1576=item $player->ext_msg ($type, @msg)
1206 1577
1207Sends an ext event to the client. 1578Sends an ext event to the client.
1208 1579
1209=cut 1580=cut
1210 1581
1211sub ext_event($$%) { 1582sub ext_msg($$@) {
1212 my ($self, $type, %msg) = @_; 1583 my ($self, $type, @msg) = @_;
1213 1584
1214 $self->ns->ext_event ($type, %msg); 1585 $self->ns->ext_msg ($type, @msg);
1215} 1586}
1216 1587
1217=head3 cf::region 1588=head3 cf::region
1218 1589
1219=over 4 1590=over 4
1222 1593
1223package cf::region; 1594package cf::region;
1224 1595
1225=item cf::region::find_by_path $path 1596=item cf::region::find_by_path $path
1226 1597
1227Tries to decuce the probable region for a map knowing only its path. 1598Tries to decuce the likely region for a map knowing only its path.
1228 1599
1229=cut 1600=cut
1230 1601
1231sub find_by_path($) { 1602sub find_by_path($) {
1232 my ($path) = @_; 1603 my ($path) = @_;
1233 1604
1234 my ($match, $specificity); 1605 my ($match, $specificity);
1235 1606
1236 for my $region (list) { 1607 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1608 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1609 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1610 if $region->specificity > $specificity;
1240 } 1611 }
1241 } 1612 }
1242 1613
1306 my ($self, $merge) = @_; 1677 my ($self, $merge) = @_;
1307 1678
1308 # we have to keep some variables in memory intact 1679 # we have to keep some variables in memory intact
1309 local $self->{path}; 1680 local $self->{path};
1310 local $self->{load_path}; 1681 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1682
1314 $self->SUPER::thawer_merge ($merge); 1683 $self->SUPER::thawer_merge ($merge);
1315} 1684}
1316 1685
1317sub normalise { 1686sub normalise {
1364 $self->init; # pass $1 etc. 1733 $self->init; # pass $1 etc.
1365 return $self; 1734 return $self;
1366 } 1735 }
1367 } 1736 }
1368 1737
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1738 Carp::cluck "unable to resolve path '$path' (base '$base').";
1370 () 1739 ()
1371} 1740}
1372 1741
1373sub init { 1742sub init {
1374 my ($self) = @_; 1743 my ($self) = @_;
1417 1786
1418 $_->change_map_light ($change) 1787 $_->change_map_light ($change)
1419 for grep $_->outdoor, values %cf::MAP; 1788 for grep $_->outdoor, values %cf::MAP;
1420} 1789}
1421 1790
1791sub decay_objects {
1792 my ($self) = @_;
1793
1794 return if $self->{deny_reset};
1795
1796 $self->do_decay_objects;
1797}
1798
1422sub unlink_save { 1799sub unlink_save {
1423 my ($self) = @_; 1800 my ($self) = @_;
1424 1801
1425 utf8::encode (my $save = $self->save_path); 1802 utf8::encode (my $save = $self->save_path);
1426 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1803 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1429 1806
1430sub load_header_from($) { 1807sub load_header_from($) {
1431 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1432 1809
1433 utf8::encode $path; 1810 utf8::encode $path;
1434 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1435 # or return;
1436
1437 $self->_load_header ($path)
1438 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1439 1819
1440 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1441 1821
1442 1 1822 1
1443} 1823}
1482 $self->load_header_orig 1862 $self->load_header_orig
1483 or return; 1863 or return;
1484 $self->prepare_orig; 1864 $self->prepare_orig;
1485 } 1865 }
1486 1866
1867 $self->{deny_reset} = 1
1868 if $self->no_reset;
1869
1487 $self->default_region (cf::region::find_by_path $self->{path}) 1870 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 1871 unless $self->default_region;
1489 1872
1490 1 1873 1
1491} 1874}
1494sub find { 1877sub find {
1495 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1496 1879
1497 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1498 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1499 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1500 1884
1501 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1502 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1503 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1504 or return; 1890 or return;
1505 1891
1506 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1507 1893
1508 $map->load_header 1894 $map->load_header
1509 or return; 1895 or return;
1510 1896
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1514 $map->reset; 1902 $map->reset;
1515 undef $guard;
1516 return find $path; 1903 return find $path;
1517 } 1904 }
1518 1905
1519 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1520 } 1907 }
1529 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1530 1917
1531 my $path = $self->{path}; 1918 my $path = $self->{path};
1532 1919
1533 { 1920 {
1534 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1535 1922
1923 return unless $self->valid;
1536 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1537 1925
1538 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1539 1927
1540 $self->alloc; 1928 $self->alloc;
1541 1929
1542 $self->pre_load; 1930 $self->pre_load;
1543 Coro::cede; 1931 cf::cede_to_tick;
1544 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1545 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1546 or return; 1936 or return;
1547 1937
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1549 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1550 1940
1551 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq; 1942 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1554 $self->clear_unique_items; 1945 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1556 } 1949 }
1557 } 1950 }
1558 1951
1559 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1560 # now do the right thing for maps 1955 # now do the right thing for maps
1561 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1562 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1563 unless $self->difficulty; 1958 unless $self->difficulty;
1564 Coro::cede; 1959 cf::cede_to_tick;
1565 1960
1566 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1567 $self->decay_objects; 1962 $self->decay_objects;
1568 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1569 $self->update_buttons; 1964 $self->update_buttons;
1570 Coro::cede; 1965 cf::cede_to_tick;
1571 $self->set_darkness_map; 1966 $self->set_darkness_map;
1572 Coro::cede; 1967 cf::cede_to_tick;
1573 $self->activate; 1968 $self->activate;
1574 } 1969 }
1970
1971 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME);
1575 1973
1576 $self->in_memory (cf::MAP_IN_MEMORY); 1974 $self->in_memory (cf::MAP_IN_MEMORY);
1577 } 1975 }
1578 1976
1579 $self->post_load; 1977 $self->post_load;
1583 my ($self, $ob) = @_; 1981 my ($self, $ob) = @_;
1584 1982
1585 return find "~" . $ob->name . "/" . $self->{path} 1983 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 1984 if $self->per_player;
1587 1985
1986# return find "?party/" . $ob->name . "/" . $self->{path}
1987# if $self->per_party;
1988
1588 $self 1989 $self
1589} 1990}
1590 1991
1591# find and load all maps in the 3x3 area around a map 1992# find and load all maps in the 3x3 area around a map
1592sub load_diag { 1993sub load_neighbours {
1593 my ($map) = @_; 1994 my ($map) = @_;
1594 1995
1595 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1596 1997
1597 for (0 .. 3) { 1998 for (0 .. 3) {
1598 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1599 or next; 2000 or next;
1600 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1601 or next; 2002 or next;
1602 $neigh->load; 2003 $neigh->load;
1603 2004
2005 push @neigh,
1604 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1605 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1606 } 2008 }
1607 2009
1608 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1609 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1610 or next; 2013 or next;
1611 $neigh->load; 2014 $neigh->load;
1612 } 2015 }
1613} 2016}
1614 2017
1619} 2022}
1620 2023
1621sub do_load_sync { 2024sub do_load_sync {
1622 my ($map) = @_; 2025 my ($map) = @_;
1623 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1624 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1625} 2031}
1626 2032
1627our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1628our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1629 2035
1630sub find_async { 2036sub find_async {
1631 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1632 2038
1633 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1634 2040
1635 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1636 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1637 } 2043 }
1638 2044
1639 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1640 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
1641 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1643 my $map = find $path 2050 if (my $map = find $k) {
1644 or next;
1645 $map->load; 2051 $map->load if $v;
2052 }
1646 2053
1647 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
1648 } 2055 }
1649 } 2056 }
1650 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
1651 }; 2058 };
1652 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
1655} 2062}
1656 2063
1657sub save { 2064sub save {
1658 my ($self) = @_; 2065 my ($self) = @_;
1659 2066
1660 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1661 2068
1662 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1663 2070
1664 return unless $self->dirty; 2071 return unless $self->dirty;
1665 2072
1688 my ($self) = @_; 2095 my ($self) = @_;
1689 2096
1690 # save first because save cedes 2097 # save first because save cedes
1691 $self->save; 2098 $self->save;
1692 2099
1693 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
1694 2101
1695 return if $self->players; 2102 return if $self->players;
1696 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
1697 return if $self->{deny_save}; 2104 return if $self->{deny_save};
1698 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
1699 $self->clear; 2110 $self->clear;
1700 $self->in_memory (cf::MAP_SWAPPED);
1701} 2111}
1702 2112
1703sub reset_at { 2113sub reset_at {
1704 my ($self) = @_; 2114 my ($self) = @_;
1705 2115
1706 # TODO: safety, remove and allow resettable per-player maps 2116 # TODO: safety, remove and allow resettable per-player maps
1707 return 1e99 if $self->isa ("ext::map_per_player");#d#
1708 return 1e99 if $self->{deny_reset}; 2117 return 1e99 if $self->{deny_reset};
1709 2118
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2119 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2120 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1712 2121
1723 my ($self) = @_; 2132 my ($self) = @_;
1724 2133
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2135
1727 return if $self->players; 2136 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2137
1730 warn "resetting map ", $self->path;#d# 2138 warn "resetting map ", $self->path;
1731 2139
1732 $self->in_memory (cf::MAP_SWAPPED); 2140 $self->in_memory (cf::MAP_SWAPPED);
1733 2141
1734 # need to save uniques path 2142 # need to save uniques path
1735 unless ($self->{deny_save}) { 2143 unless ($self->{deny_save}) {
1739 if $uniq; 2147 if $uniq;
1740 } 2148 }
1741 2149
1742 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
1743 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
1744 $self->clear; 2154 $self->clear;
1745
1746 $_->clear_links_to ($self) for values %cf::MAP;
1747 2155
1748 $self->unlink_save; 2156 $self->unlink_save;
1749 $self->destroy; 2157 $self->destroy;
1750} 2158}
1751 2159
1752my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
1753 2161
1754sub nuke { 2162sub nuke {
1755 my ($self) = @_; 2163 my ($self) = @_;
1756 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
1757 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
1758 2169
1759 $self->unlink_save; 2170 $self->unlink_save;
1760 2171
1761 bless $self, "cf::map"; 2172 bless $self, "cf::map";
1762 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
1763 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
1764 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
1765 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1766 2177
1767 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
1768 2180
1769 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2182}
2183
2184=item $maps = cf::map::tmp_maps
2185
2186Returns an arrayref with all map paths of currently instantiated and saved
2187maps. May block.
2188
2189=cut
2190
2191sub tmp_maps() {
2192 [
2193 map {
2194 utf8::decode $_;
2195 /\.map$/
2196 ? normalise $_
2197 : ()
2198 } @{ aio_readdir $TMPDIR or [] }
2199 ]
2200}
2201
2202=item $maps = cf::map::random_maps
2203
2204Returns an arrayref with all map paths of currently instantiated and saved
2205random maps. May block.
2206
2207=cut
2208
2209sub random_maps() {
2210 [
2211 map {
2212 utf8::decode $_;
2213 /\.map$/
2214 ? normalise "?random/$_"
2215 : ()
2216 } @{ aio_readdir $RANDOMDIR or [] }
2217 ]
1770} 2218}
1771 2219
1772=item cf::map::unique_maps 2220=item cf::map::unique_maps
1773 2221
1774Returns an arrayref of paths of all shared maps that have 2222Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2223instantiated unique items. May block.
1776 2224
1777=cut 2225=cut
1778 2226
1779sub unique_maps() { 2227sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2228 [
1781 or return; 2229 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2230 utf8::decode $_;
1787 next if /\.pst$/; 2231 /\.map$/
1788 next unless /^$PATH_SEP/o; 2232 ? normalise $_
1789 2233 : ()
1790 push @paths, cf::map::normalise $_; 2234 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2235 ]
1792
1793 \@paths
1794} 2236}
1795 2237
1796package cf; 2238package cf;
1797 2239
1798=back 2240=back
1816 map { $_, inv_recursive_ $_->inv } @_ 2258 map { $_, inv_recursive_ $_->inv } @_
1817} 2259}
1818 2260
1819sub inv_recursive { 2261sub inv_recursive {
1820 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2263}
2264
2265=item $ref = $ob->ref
2266
2267creates and returns a persistent reference to an objetc that can be stored as a string.
2268
2269=item $ob = cf::object::deref ($refstring)
2270
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block.
2273
2274=cut
2275
2276sub deref {
2277 my ($ref) = @_;
2278
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
1821} 2294}
1822 2295
1823package cf; 2296package cf;
1824 2297
1825=back 2298=back
1844 2317
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2318 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2319
1847 if ($self->{record_replies}) { 2320 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2321 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2322
1849 } else { 2323 } else {
2324 my $pl = $self->contr;
2325
2326 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2327 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329
2330 } else {
1850 $msg = $npc->name . " says: $msg" if $npc; 2331 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2333 }
1852 } 2334 }
2335}
2336
2337=item $object->send_msg ($channel, $msg, $color, [extra...])
2338
2339=cut
2340
2341sub cf::object::send_msg {
2342 my $pl = shift->contr
2343 or return;
2344 $pl->send_msg (@_);
1853} 2345}
1854 2346
1855=item $player_object->may ("access") 2347=item $player_object->may ("access")
1856 2348
1857Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
1904 $self->deactivate_recursive; 2396 $self->deactivate_recursive;
1905 2397
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2398 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 2399
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map; 2401 if $self->map && $self->map->{path} ne "{link}";
1910 2402
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2403 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1912} 2404}
1913 2405
1914sub cf::object::player::leave_link { 2406sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 2407 my ($self, $map, $x, $y) = @_;
2408
2409 return unless $self->contr->active;
1916 2410
1917 my $link_pos = delete $self->{_link_pos}; 2411 my $link_pos = delete $self->{_link_pos};
1918 2412
1919 unless ($map) { 2413 unless ($map) {
1920 # restore original map position 2414 # restore original map position
1934 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
1935 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
1936 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
1937 2431
1938 $map->load; 2432 $map->load;
1939 $map->load_diag; 2433 $map->load_neighbours;
1940 2434
1941 return unless $self->contr->active; 2435 return unless $self->contr->active;
1942 $self->activate_recursive; 2436 $self->activate_recursive;
1943 2437
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 2439 $self->enter_map ($map, $x, $y);
1946} 2440}
1947 2441
1948cf::player->attach (
1949 on_logout => sub {
1950 my ($pl) = @_;
1951
1952 # abort map switching before logout
1953 if ($pl->ob->{_link_pos}) {
1954 cf::sync_job {
1955 $pl->ob->leave_link
1956 };
1957 }
1958 },
1959 on_login => sub {
1960 my ($pl) = @_;
1961
1962 # try to abort aborted map switching on player login :)
1963 # should happen only on crashes
1964 if ($pl->ob->{_link_pos}) {
1965 $pl->ob->enter_link;
1966 (async {
1967 $pl->ob->reply (undef,
1968 "There was an internal problem at your last logout, "
1969 . "the server will try to bring you to your intended destination in a second.",
1970 cf::NDI_RED);
1971 # we need this sleep as the login has a concurrent enter_exit running
1972 # and this sleep increases chances of the player not ending up in scorn
1973 Coro::Timer::sleep 1;
1974 $pl->ob->leave_link;
1975 })->prio (2);
1976 }
1977 },
1978);
1979
1980=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1981 2443
1982Moves the player to the given map-path and coordinates by first freezing 2444Moves the player to the given map-path and coordinates by first freezing
1983her, loading and preparing them map, calling the provided $check callback 2445her, loading and preparing them map, calling the provided $check callback
1984that has to return the map if sucecssful, and then unfreezes the player on 2446that has to return the map if sucecssful, and then unfreezes the player on
1985the new (success) or old (failed) map position. 2447the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process.
1986 2449
1987=cut 2450=cut
2451
2452our $GOTOGEN;
1988 2453
1989sub cf::object::player::goto { 2454sub cf::object::player::goto {
1990 my ($self, $path, $x, $y, $check) = @_; 2455 my ($self, $path, $x, $y, $check, $done) = @_;
2456
2457 # do generation counting so two concurrent goto's will be executed in-order
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1991 2459
1992 $self->enter_link; 2460 $self->enter_link;
1993 2461
1994 (async { 2462 (async {
1995 my $map = eval { 2463 my $map = eval {
2008 if ($@) { 2476 if ($@) {
2009 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED); 2477 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2010 LOG llevError | logBacktrace, Carp::longmess $@; 2478 LOG llevError | logBacktrace, Carp::longmess $@;
2011 } 2479 }
2012 2480
2481 if ($gen == $self->{_goto_generation}) {
2482 delete $self->{_goto_generation};
2013 $self->leave_link ($map, $x, $y); 2483 $self->leave_link ($map, $x, $y);
2484 }
2485
2486 $done->() if $done;
2014 })->prio (1); 2487 })->prio (1);
2015} 2488}
2016 2489
2017=item $player_object->enter_exit ($exit_object) 2490=item $player_object->enter_exit ($exit_object)
2018 2491
2087 my $hp = $exit->stats->hp; 2560 my $hp = $exit->stats->hp;
2088 my $sp = $exit->stats->sp; 2561 my $sp = $exit->stats->sp;
2089 2562
2090 $self->enter_link; 2563 $self->enter_link;
2091 2564
2565 # if exit is damned, update players death & WoR home-position
2566 $self->contr->savebed ($slaying, $hp, $sp)
2567 if $exit->flag (FLAG_DAMNED);
2568
2092 (async { 2569 (async {
2093 $self->deactivate_recursive; # just to be sure 2570 $self->deactivate_recursive; # just to be sure
2094 unless (eval { 2571 unless (eval {
2095 $self->goto ($slaying, $hp, $sp); 2572 $self->goto ($slaying, $hp, $sp);
2096 2573
2123 2600
2124 utf8::encode $text; 2601 utf8::encode $text;
2125 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2602 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2126} 2603}
2127 2604
2605=item $client->send_msg ($channel, $msg, $color, [extra...])
2606
2607Send a drawinfo or msg packet to the client, formatting the msg for the
2608client if neccessary. C<$type> should be a string identifying the type of
2609the message, with C<log> being the default. If C<$color> is negative, suppress
2610the message unless the client supports the msg packet.
2611
2612=cut
2613
2614our %CHANNEL = (
2615 "c/identify" => {
2616 id => "identify",
2617 title => "Identify",
2618 reply => undef,
2619 tooltip => "Items recently identified",
2620 },
2621 "c/examine" => {
2622 id => "examine",
2623 title => "Examine",
2624 reply => undef,
2625 tooltip => "Signs and other items you examined",
2626 },
2627);
2628
2629sub cf::client::send_msg {
2630 my ($self, $channel, $msg, $color, @extra) = @_;
2631
2632 $msg = $self->pl->expand_cfpod ($msg);
2633
2634 $color &= cf::NDI_CLIENT_MASK; # just in case...
2635
2636 # check predefined channels, for the benefit of C
2637 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2638
2639 if (ref $channel) {
2640 # send meta info to client, if not yet sent
2641 unless (exists $self->{channel}{$channel->{id}}) {
2642 $self->{channel}{$channel->{id}} = $channel;
2643 $self->ext_msg (channel_info => $channel)
2644 if $self->can_msg;
2645 }
2646
2647 $channel = $channel->{id};
2648 }
2649
2650 return unless @extra || length $msg;
2651
2652 if ($self->can_msg) {
2653 # default colour, mask it out
2654 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2655 if $color & cf::NDI_DEF;
2656
2657 $self->send_packet ("msg " . $self->{json_coder}->encode (
2658 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2659 } else {
2660 if ($color >= 0) {
2661 # replace some tags by gcfclient-compatible ones
2662 for ($msg) {
2663 1 while
2664 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2665 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2666 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2667 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2668 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2669 }
2670
2671 $color &= cf::NDI_COLOR_MASK;
2672
2673 utf8::encode $msg;
2674
2675 if (0 && $msg =~ /\[/) {
2676 # COMMAND/INFO
2677 $self->send_packet ("drawextinfo $color 10 8 $msg")
2678 } else {
2679 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2680 $self->send_packet ("drawinfo $color $msg")
2681 }
2682 }
2683 }
2684}
2685
2128=item $client->ext_event ($type, %msg) 2686=item $client->ext_msg ($type, @msg)
2129 2687
2130Sends an exti event to the client. 2688Sends an ext event to the client.
2131 2689
2132=cut 2690=cut
2133 2691
2134sub cf::client::ext_event($$%) { 2692sub cf::client::ext_msg($$@) {
2135 my ($self, $type, %msg) = @_; 2693 my ($self, $type, @msg) = @_;
2136 2694
2695 if ($self->extcmd == 2) {
2696 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2697 } elsif ($self->extcmd == 1) { # TODO: remove
2137 $msg{msgtype} = "event_$type"; 2698 push @msg, msgtype => "event_$type";
2138 $self->send_packet ("ext " . cf::to_json \%msg); 2699 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2700 }
2701}
2702
2703=item $client->ext_reply ($msgid, @msg)
2704
2705Sends an ext reply to the client.
2706
2707=cut
2708
2709sub cf::client::ext_reply($$@) {
2710 my ($self, $id, @msg) = @_;
2711
2712 if ($self->extcmd == 2) {
2713 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2714 } elsif ($self->extcmd == 1) {
2715 #TODO: version 1, remove
2716 unshift @msg, msgtype => "reply", msgid => $id;
2717 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2718 }
2139} 2719}
2140 2720
2141=item $success = $client->query ($flags, "text", \&cb) 2721=item $success = $client->query ($flags, "text", \&cb)
2142 2722
2143Queues a query to the client, calling the given callback with 2723Queues a query to the client, calling the given callback with
2144the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2724the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2145C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2725C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2146 2726
2147Queries can fail, so check the return code. Or don't, as queries will become 2727Queries can fail, so check the return code. Or don't, as queries will
2148reliable at some point in the future. 2728become reliable at some point in the future.
2149 2729
2150=cut 2730=cut
2151 2731
2152sub cf::client::query { 2732sub cf::client::query {
2153 my ($self, $flags, $text, $cb) = @_; 2733 my ($self, $flags, $text, $cb) = @_;
2161 utf8::encode $text; 2741 utf8::encode $text;
2162 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2742 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2163 2743
2164 $self->send_packet ($self->{query_queue}[0][0]) 2744 $self->send_packet ($self->{query_queue}[0][0])
2165 if @{ $self->{query_queue} } == 1; 2745 if @{ $self->{query_queue} } == 1;
2746
2747 1
2166} 2748}
2167 2749
2168cf::client->attach ( 2750cf::client->attach (
2751 on_connect => sub {
2752 my ($ns) = @_;
2753
2754 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2755 },
2169 on_reply => sub { 2756 on_reply => sub {
2170 my ($ns, $msg) = @_; 2757 my ($ns, $msg) = @_;
2171 2758
2172 # this weird shuffling is so that direct followup queries 2759 # this weird shuffling is so that direct followup queries
2173 # get handled first 2760 # get handled first
2185 } else { 2772 } else {
2186 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2773 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2187 } 2774 }
2188 } 2775 }
2189 }, 2776 },
2777 on_exticmd => sub {
2778 my ($ns, $buf) = @_;
2779
2780 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2781
2782 if (ref $msg) {
2783 my ($type, $reply, @payload) =
2784 "ARRAY" eq ref $msg
2785 ? @$msg
2786 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2787
2788 my @reply;
2789
2790 if (my $cb = $EXTICMD{$type}) {
2791 @reply = $cb->($ns, @payload);
2792 }
2793
2794 $ns->ext_reply ($reply, @reply)
2795 if $reply;
2796
2797 } else {
2798 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2799 }
2800
2801 cf::override;
2802 },
2190); 2803);
2191 2804
2192=item $client->async (\&cb) 2805=item $client->async (\&cb)
2193 2806
2194Create a new coroutine, running the specified callback. The coroutine will 2807Create a new coroutine, running the specified callback. The coroutine will
2235our $safe = new Safe "safe"; 2848our $safe = new Safe "safe";
2236our $safe_hole = new Safe::Hole; 2849our $safe_hole = new Safe::Hole;
2237 2850
2238$SIG{FPE} = 'IGNORE'; 2851$SIG{FPE} = 'IGNORE';
2239 2852
2240$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2853$safe->permit_only (Opcode::opset qw(
2854 :base_core :base_mem :base_orig :base_math
2855 grepstart grepwhile mapstart mapwhile
2856 sort time
2857));
2241 2858
2242# here we export the classes and methods available to script code 2859# here we export the classes and methods available to script code
2243 2860
2244=pod 2861=pod
2245 2862
2246The following functions and methods are available within a safe environment: 2863The following functions and methods are available within a safe environment:
2247 2864
2248 cf::object contr pay_amount pay_player map 2865 cf::object
2866 contr pay_amount pay_player map x y force_find force_add
2867 insert remove name archname title slaying race decrease_ob_nr
2868
2249 cf::object::player player 2869 cf::object::player
2250 cf::player peaceful 2870 player
2251 cf::map trigger 2871
2872 cf::player
2873 peaceful
2874
2875 cf::map
2876 trigger
2252 2877
2253=cut 2878=cut
2254 2879
2255for ( 2880for (
2256 ["cf::object" => qw(contr pay_amount pay_player map)], 2881 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2882 insert remove inv name archname title slaying race
2883 decrease_ob_nr)],
2257 ["cf::object::player" => qw(player)], 2884 ["cf::object::player" => qw(player)],
2258 ["cf::player" => qw(peaceful)], 2885 ["cf::player" => qw(peaceful)],
2259 ["cf::map" => qw(trigger)], 2886 ["cf::map" => qw(trigger)],
2260) { 2887) {
2261 no strict 'refs'; 2888 no strict 'refs';
2332=back 2959=back
2333 2960
2334=cut 2961=cut
2335 2962
2336############################################################################# 2963#############################################################################
2337
2338=head2 EXTENSION DATABASE SUPPORT
2339
2340Crossfire maintains a very simple database for extension use. It can
2341currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2342convert to/from binary).
2343
2344The parameter C<$family> should best start with the name of the extension
2345using it, it should be unique.
2346
2347=over 4
2348
2349=item $value = cf::db_get $family => $key
2350
2351Returns a single value from the database.
2352
2353=item cf::db_put $family => $key => $value
2354
2355Stores the given C<$value> in the family.
2356
2357=cut
2358
2359our $DB;
2360
2361sub db_init {
2362 unless ($DB) {
2363 $DB = BDB::db_create $DB_ENV;
2364
2365 cf::sync_job {
2366 eval {
2367 $DB->set_flags (BDB::CHKSUM);
2368
2369 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2370 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2371 cf::cleanup "db_open(db): $!" if $!;
2372 };
2373 cf::cleanup "db_open(db): $@" if $@;
2374 };
2375 }
2376}
2377
2378sub db_get($$) {
2379 my $key = "$_[0]/$_[1]";
2380
2381 cf::sync_job {
2382 BDB::db_get $DB, undef, $key, my $data;
2383
2384 $! ? ()
2385 : $data
2386 }
2387}
2388
2389sub db_put($$$) {
2390 BDB::dbreq_pri 4;
2391 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2392}
2393
2394=item cf::cache $id => [$paths...], $processversion => $process
2395
2396Generic caching function that returns the value of the resource $id,
2397caching and regenerating as required.
2398
2399This function can block.
2400
2401=cut
2402
2403sub cache {
2404 my ($id, $src, $processversion, $process) = @_;
2405
2406 my $meta =
2407 join "\x00",
2408 $processversion,
2409 map {
2410 aio_stat $_
2411 and Carp::croak "$_: $!";
2412
2413 ($_, (stat _)[7,9])
2414 } @$src;
2415
2416 my $dbmeta = db_get cache => "$id/meta";
2417 if ($dbmeta ne $meta) {
2418 # changed, we may need to process
2419
2420 my @data;
2421 my $md5;
2422
2423 for (0 .. $#$src) {
2424 0 <= aio_load $src->[$_], $data[$_]
2425 or Carp::croak "$src->[$_]: $!";
2426 }
2427
2428 # if processing is expensive, check
2429 # checksum first
2430 if (1) {
2431 $md5 =
2432 join "\x00",
2433 $processversion,
2434 map {
2435 Coro::cede;
2436 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2437 } 0.. $#$src;
2438
2439
2440 my $dbmd5 = db_get cache => "$id/md5";
2441 if ($dbmd5 eq $md5) {
2442 db_put cache => "$id/meta", $meta;
2443
2444 return db_get cache => "$id/data";
2445 }
2446 }
2447
2448 my $t1 = Time::HiRes::time;
2449 my $data = $process->(\@data);
2450 my $t2 = Time::HiRes::time;
2451
2452 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2453
2454 db_put cache => "$id/data", $data;
2455 db_put cache => "$id/md5" , $md5;
2456 db_put cache => "$id/meta", $meta;
2457
2458 return $data;
2459 }
2460
2461 db_get cache => "$id/data"
2462}
2463
2464=item fork_call { }, $args
2465
2466Executes the given code block with the given arguments in a seperate
2467process, returning the results. Everything must be serialisable with
2468Coro::Storable. May, of course, block. Note that the executed sub may
2469never block itself or use any form of Event handling.
2470
2471=cut
2472
2473sub fork_call(&@) {
2474 my ($cb, @args) = @_;
2475
2476# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2477# or die "socketpair: $!";
2478 pipe my $fh1, my $fh2
2479 or die "pipe: $!";
2480
2481 if (my $pid = fork) {
2482 close $fh2;
2483
2484 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2485 $res = Coro::Storable::thaw $res;
2486
2487 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2488
2489 die $$res unless "ARRAY" eq ref $res;
2490
2491 return wantarray ? @$res : $res->[-1];
2492 } else {
2493 reset_signals;
2494 local $SIG{__WARN__};
2495 local $SIG{__DIE__};
2496 eval {
2497 close $fh1;
2498
2499 my @res = eval { $cb->(@args) };
2500 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2501 };
2502
2503 warn $@ if $@;
2504 _exit 0;
2505 }
2506}
2507
2508
2509
2510#############################################################################
2511# the server's init and main functions 2964# the server's init and main functions
2512 2965
2513sub load_facedata($) { 2966sub load_facedata($) {
2514 my ($path) = @_; 2967 my ($path) = @_;
2968
2969 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = ();
2972
2973 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2515 2974
2516 warn "loading facedata from $path\n"; 2975 warn "loading facedata from $path\n";
2517 2976
2518 my $facedata; 2977 my $facedata;
2519 0 < aio_load $path, $facedata 2978 0 < aio_load $path, $facedata
2522 $facedata = Coro::Storable::thaw $facedata; 2981 $facedata = Coro::Storable::thaw $facedata;
2523 2982
2524 $facedata->{version} == 2 2983 $facedata->{version} == 2
2525 or cf::cleanup "$path: version mismatch, cannot proceed."; 2984 or cf::cleanup "$path: version mismatch, cannot proceed.";
2526 2985
2986 # patch in the exptable
2987 $facedata->{resource}{"res/exp_table"} = {
2988 type => FT_RSRC,
2989 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2990 };
2991 cf::cede_to_tick;
2992
2527 { 2993 {
2528 my $faces = $facedata->{faceinfo}; 2994 my $faces = $facedata->{faceinfo};
2529 2995
2530 while (my ($face, $info) = each %$faces) { 2996 while (my ($face, $info) = each %$faces) {
2531 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2997 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2532 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2998 cf::face::set_visibility $idx, $info->{visibility};
2999 cf::face::set_magicmap $idx, $info->{magicmap};
2533 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3000 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2534 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3001 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2535 Coro::cede; 3002
3003 cf::cede_to_tick;
2536 } 3004 }
2537 3005
2538 while (my ($face, $info) = each %$faces) { 3006 while (my ($face, $info) = each %$faces) {
2539 next unless $info->{smooth}; 3007 next unless $info->{smooth};
2540 my $idx = cf::face::find $face 3008 my $idx = cf::face::find $face
2541 or next; 3009 or next;
2542 if (my $smooth = cf::face::find $info->{smooth}) { 3010 if (my $smooth = cf::face::find $info->{smooth}) {
3011 cf::face::set_smooth $idx, $smooth;
2543 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3012 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2544 } else { 3013 } else {
2545 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3014 warn "smooth face '$info->{smooth}' not found for face '$face'";
2546 } 3015 }
2547 Coro::cede; 3016
3017 cf::cede_to_tick;
2548 } 3018 }
2549 } 3019 }
2550 3020
2551 { 3021 {
2552 my $anims = $facedata->{animinfo}; 3022 my $anims = $facedata->{animinfo};
2553 3023
2554 while (my ($anim, $info) = each %$anims) { 3024 while (my ($anim, $info) = each %$anims) {
2555 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3025 cf::anim::set $anim, $info->{frames}, $info->{facings};
2556 Coro::cede; 3026 cf::cede_to_tick;
2557 } 3027 }
2558 3028
2559 cf::anim::invalidate_all; # d'oh 3029 cf::anim::invalidate_all; # d'oh
2560 } 3030 }
2561 3031
3032 {
3033 # TODO: for gcfclient pleasure, we should give resources
3034 # that gcfclient doesn't grok a >10000 face index.
3035 my $res = $facedata->{resource};
3036
3037 my $soundconf = delete $res->{"res/sound.conf"};
3038
3039 while (my ($name, $info) = each %$res) {
3040 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3041 my $data;
3042
3043 if ($info->{type} & 1) {
3044 # prepend meta info
3045
3046 my $meta = $enc->encode ({
3047 name => $name,
3048 %{ $info->{meta} || {} },
3049 });
3050
3051 $data = pack "(w/a*)*", $meta, $info->{data};
3052 } else {
3053 $data = $info->{data};
3054 }
3055
3056 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3057 cf::face::set_type $idx, $info->{type};
3058
3059 cf::cede_to_tick;
3060 }
3061
3062 if ($soundconf) {
3063 $soundconf = $enc->decode (delete $soundconf->{data});
3064
3065 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3066 my $sound = $soundconf->{compat}[$_]
3067 or next;
3068
3069 my $face = cf::face::find "sound/$sound->[1]";
3070 cf::sound::set $sound->[0] => $face;
3071 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3072 }
3073
3074 while (my ($k, $v) = each %{$soundconf->{event}}) {
3075 my $face = cf::face::find "sound/$v";
3076 cf::sound::set $k => $face;
3077 }
3078 }
3079 }
3080
2562 1 3081 1
2563} 3082}
2564 3083
3084register_exticmd fx_want => sub {
3085 my ($ns, $want) = @_;
3086
3087 while (my ($k, $v) = each %$want) {
3088 $ns->fx_want ($k, $v);
3089 }
3090};
3091
2565sub reload_regions { 3092sub reload_regions {
3093 # HACK to clear player env face cache, we need some signal framework
3094 # for this (global event?)
3095 %ext::player_env::MUSIC_FACE_CACHE = ();
3096
2566 load_resource_file "$MAPDIR/regions" 3097 load_resource_file "$MAPDIR/regions"
2567 or die "unable to load regions file\n"; 3098 or die "unable to load regions file\n";
3099
3100 for (cf::region::list) {
3101 $_->{match} = qr/$_->{match}/
3102 if exists $_->{match};
3103 }
2568} 3104}
2569 3105
2570sub reload_facedata { 3106sub reload_facedata {
2571 load_facedata "$DATADIR/facedata" 3107 load_facedata "$DATADIR/facedata"
2572 or die "unable to load facedata\n"; 3108 or die "unable to load facedata\n";
2573} 3109}
2574 3110
2575sub reload_archetypes { 3111sub reload_archetypes {
2576 load_resource_file "$DATADIR/archetypes" 3112 load_resource_file "$DATADIR/archetypes"
2577 or die "unable to load archetypes\n"; 3113 or die "unable to load archetypes\n";
3114 #d# NEED to laod twice to resolve forward references
3115 # this really needs to be done in an extra post-pass
3116 # (which needs to be synchronous, so solve it differently)
3117 load_resource_file "$DATADIR/archetypes"
3118 or die "unable to load archetypes\n";
2578} 3119}
2579 3120
2580sub reload_treasures { 3121sub reload_treasures {
2581 load_resource_file "$DATADIR/treasures" 3122 load_resource_file "$DATADIR/treasures"
2582 or die "unable to load treasurelists\n"; 3123 or die "unable to load treasurelists\n";
2585sub reload_resources { 3126sub reload_resources {
2586 warn "reloading resource files...\n"; 3127 warn "reloading resource files...\n";
2587 3128
2588 reload_regions; 3129 reload_regions;
2589 reload_facedata; 3130 reload_facedata;
3131 #reload_archetypes;#d#
2590 reload_archetypes; 3132 reload_archetypes;
2591 reload_treasures; 3133 reload_treasures;
2592 3134
2593 warn "finished reloading resource files\n"; 3135 warn "finished reloading resource files\n";
2594} 3136}
2595 3137
2596sub init { 3138sub init {
2597 reload_resources; 3139 reload_resources;
2598} 3140}
2599 3141
2600sub cfg_load { 3142sub reload_config {
2601 open my $fh, "<:utf8", "$CONFDIR/config" 3143 open my $fh, "<:utf8", "$CONFDIR/config"
2602 or return; 3144 or return;
2603 3145
2604 local $/; 3146 local $/;
2605 *CFG = YAML::Syck::Load <$fh>; 3147 *CFG = YAML::Syck::Load <$fh>;
2625 (async { 3167 (async {
2626 Event::one_event; 3168 Event::one_event;
2627 })->prio (Coro::PRIO_MAX); 3169 })->prio (Coro::PRIO_MAX);
2628 }; 3170 };
2629 3171
2630 cfg_load; 3172 reload_config;
2631 db_init; 3173 db_init;
2632 load_extensions; 3174 load_extensions;
2633 3175
2634 $TICK_WATCHER->start; 3176 $TICK_WATCHER->start;
2635 Event::loop; 3177 Event::loop;
2651 }, 3193 },
2652 ); 3194 );
2653 } 3195 }
2654} 3196}
2655 3197
3198sub write_runtime {
3199 my $runtime = "$LOCALDIR/runtime";
3200
3201 # first touch the runtime file to show we are still running:
3202 # the fsync below can take a very very long time.
3203
3204 IO::AIO::aio_utime $runtime, undef, undef;
3205
3206 my $guard = cf::lock_acquire "write_runtime";
3207
3208 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3209 or return;
3210
3211 my $value = $cf::RUNTIME + 90 + 10;
3212 # 10 is the runtime save interval, for a monotonic clock
3213 # 60 allows for the watchdog to kill the server.
3214
3215 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3216 and return;
3217
3218 # always fsync - this file is important
3219 aio_fsync $fh
3220 and return;
3221
3222 # touch it again to show we are up-to-date
3223 aio_utime $fh, undef, undef;
3224
3225 close $fh
3226 or return;
3227
3228 aio_rename "$runtime~", $runtime
3229 and return;
3230
3231 warn "runtime file written.\n";
3232
3233 1
3234}
3235
2656sub emergency_save() { 3236sub emergency_save() {
2657 my $freeze_guard = cf::freeze_mainloop; 3237 my $freeze_guard = cf::freeze_mainloop;
2658 3238
2659 warn "enter emergency perl save\n"; 3239 warn "enter emergency perl save\n";
2660 3240
2735 %EXT_CORO = (); 3315 %EXT_CORO = ();
2736 3316
2737 warn "removing commands"; 3317 warn "removing commands";
2738 %COMMAND = (); 3318 %COMMAND = ();
2739 3319
2740 warn "removing ext commands"; 3320 warn "removing ext/exti commands";
2741 %EXTCMD = (); 3321 %EXTCMD = ();
3322 %EXTICMD = ();
2742 3323
2743 warn "unloading/nuking all extensions"; 3324 warn "unloading/nuking all extensions";
2744 for my $pkg (@EXTS) { 3325 for my $pkg (@EXTS) {
2745 warn "... unloading $pkg"; 3326 warn "... unloading $pkg";
2746 3327
2789 warn "reloading cf.pm"; 3370 warn "reloading cf.pm";
2790 require cf; 3371 require cf;
2791 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3372 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2792 3373
2793 warn "loading config and database again"; 3374 warn "loading config and database again";
2794 cf::cfg_load; 3375 cf::reload_config;
2795 3376
2796 warn "loading extensions"; 3377 warn "loading extensions";
2797 cf::load_extensions; 3378 cf::load_extensions;
2798 3379
2799 warn "reattaching attachments to objects/players"; 3380 warn "reattaching attachments to objects/players";
2864 my $signal = new Coro::Signal; 3445 my $signal = new Coro::Signal;
2865 push @WAIT_FOR_TICK_BEGIN, $signal; 3446 push @WAIT_FOR_TICK_BEGIN, $signal;
2866 $signal->wait; 3447 $signal->wait;
2867} 3448}
2868 3449
2869 my $min = 1e6;#d# 3450our $stat_fh;
2870 my $avg = 10; 3451sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3452
2871$TICK_WATCHER = Event->timer ( 3453$TICK_WATCHER = Event->timer (
2872 reentrant => 0, 3454 reentrant => 0,
2873 parked => 1, 3455 parked => 1,
2874 prio => 0, 3456 prio => 0,
2875 at => $NEXT_TICK || $TICK, 3457 at => $NEXT_TICK || $TICK,
2879 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3461 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2880 unless ++$bug_warning > 10; 3462 unless ++$bug_warning > 10;
2881 return; 3463 return;
2882 } 3464 }
2883 3465
3466 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3467
2884 $NOW = $tick_start = Event::time; 3468 $NOW = $tick_start = Event::time;
2885 3469
2886 cf::server_tick; # one server iteration 3470 cf::server_tick; # one server iteration
2887
2888 0 && sync_job {#d#
2889 for(1..10) {
2890 my $t = Event::time;
2891 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2892 or die;
2893
2894 $map->width (50);
2895 $map->height (50);
2896 $map->alloc;
2897 $map->_load_objects ("/tmp/x.map", 1);
2898 my $t = Event::time - $t;
2899
2900 #next unless $t < 0.0013;#d#
2901 if ($t < $min) {
2902 $min = $t;
2903 }
2904 $avg = $avg * 0.99 + $t * 0.01;
2905 }
2906 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2907 exit 0;
2908 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2909 };
2910 3471
2911 $RUNTIME += $TICK; 3472 $RUNTIME += $TICK;
2912 $NEXT_TICK += $TICK; 3473 $NEXT_TICK += $TICK;
2913 3474
2914 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3475 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2940 $LOAD = ($NOW - $tick_start) / $TICK; 3501 $LOAD = ($NOW - $tick_start) / $TICK;
2941 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3502 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2942 3503
2943 _post_tick; 3504 _post_tick;
2944 3505
2945 3506 # gather some statistics#d#
3507 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3508 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
2946 }, 3509 },
2947); 3510);
2948 3511
2949{ 3512{
3513 BDB::min_parallel 8;
2950 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
2951 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
2952 reentrant => 0, 3516 reentrant => 0,
2953 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
2954 poll => 'r', 3518 poll => 'r',
2955 prio => 0, 3519 prio => 0,
2956 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
2957 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
2958 ); 3522 );
2959 BDB::min_parallel 8;
2960 3523
2961 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
2962 my $status; 3525 my $status;
2963 my $current = $Coro::current; 3526 my $current = $Coro::current;
2964 ( 3527 (
2985 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3548 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2986 0666; 3549 0666;
2987 3550
2988 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3551 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2989 3552
2990 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3553 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3554 | BDB::LOG_AUTOREMOVE, 1);
2991 $DB_ENV->set_lk_detect; 3555 $DB_ENV->set_lk_detect;
2992 }; 3556 };
2993 3557
2994 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
2995 }; 3559 };
2996 } 3560 }
3561
3562 $BDB_CHECKPOINT_WATCHER = Event->timer (
3563 after => 11,
3564 interval => 60,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3570 },
3571 );
3572 $BDB_TRICKLE_WATCHER = Event->timer (
3573 after => 5,
3574 interval => 10,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3580 },
3581 );
2997} 3582}
2998 3583
2999{ 3584{
3000 IO::AIO::min_parallel 8; 3585 IO::AIO::min_parallel 8;
3001 3586

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines