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.250 by root, Wed Apr 18 14:24:10 2007 UTC vs.
Revision 1.352 by root, Sun Sep 2 04:57:14 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;
59our $LIBDIR = datadir . "/ext"; 63
64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
60 75
61our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
62our $TICK_WATCHER; 77our $TICK_WATCHER;
63our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
64our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
75our $RUNTIME; 90our $RUNTIME;
76 91
77our %PLAYER; # all users 92our %PLAYER; # all users
78our %MAP; # all maps 93our %MAP; # all maps
79our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
80our $RANDOM_MAPS = cf::localdir . "/random";
81our $BDB_ENV_DIR = cf::localdir . "/db";
82 95
83# 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 ∕
84our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
85 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
86binmode STDOUT; 103binmode STDOUT;
87binmode STDERR; 104binmode STDERR;
88 105
89# read virtual server time, if available 106# read virtual server time, if available
90unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
91 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
92 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
93 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
94} 111}
95 112
96mkdir cf::localdir; 113mkdir $_
97mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
98mkdir cf::localdir . "/" . cf::tmpdir;
99mkdir cf::localdir . "/" . cf::uniquedir;
100mkdir $RANDOM_MAPS;
101mkdir $BDB_ENV_DIR;
102 115
103our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
104 117
105sub cf::map::normalise; 118sub cf::map::normalise;
106 119
117=item $cf::RUNTIME 130=item $cf::RUNTIME
118 131
119The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
120every server tick. 133every server tick.
121 134
122=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
123 138
124The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
125be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
126 143
127=item $cf::NOW 144=item $cf::NOW
128 145
129The time of the last (current) server tick. 146The time of the last (current) server tick.
130 147
131=item $cf::TICK 148=item $cf::TICK
132 149
133The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
134 161
135=item %cf::CFG 162=item %cf::CFG
136 163
137Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
138from wherever your confdir points to. 165from wherever your confdir points to.
141 168
142These 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
143returns 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
144per 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.
145 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.
178
146=back 179=back
147 180
148=cut 181=cut
149 182
150BEGIN { 183BEGIN {
152 my $msg = join "", @_; 185 my $msg = join "", @_;
153 186
154 $msg .= "\n" 187 $msg .= "\n"
155 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
156 189
157 $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
158 191
159 utf8::encode $msg; 192 utf8::encode $msg;
160 LOG llevError, $msg; 193 LOG llevError, $msg;
161 }; 194 };
162} 195}
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
169@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
170 204
171# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
172# within the Safe compartment. 206# within the Safe compartment.
173for my $pkg (qw( 207for my $pkg (qw(
174 cf::global cf::attachable 208 cf::global cf::attachable
182} 216}
183 217
184$Event::DIED = sub { 218$Event::DIED = sub {
185 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
186}; 220};
221
222#############################################################################
187 223
188=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
189 225
190=over 4 226=over 4
191 227
210 $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;
211 $d 247 $d
212 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
213} 249}
214 250
215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
216
217=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
218 252
219Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
220 254
221=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
222 256
223Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
224 265
225=item cf::lock_wait $string 266=item cf::lock_wait $string
226 267
227Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
228 269
231Wait 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
232a 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,
233for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
234returned. 275returned.
235 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
236Lock 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
237uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
238 286
239=cut 287=cut
240 288
241our %LOCK; 289our %LOCK;
242 290
260 308
261 Coro::guard { 309 Coro::guard {
262 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
264 } 312 }
313}
314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
265} 319}
266 320
267sub freeze_mainloop { 321sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
269 323
272 }; 326 };
273 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
274 $guard 328 $guard
275} 329}
276 330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
385}
386
277=item cf::async { BLOCK } 387=item cf::async { BLOCK }
278 388
279Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
280C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 390C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
281thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
284 394
285BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
286 396
287=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
288 398
289The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
290always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
291reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
292 403
293If it must be done, put the blocking parts into C<sync_job>. This will run 404If it must be done, put the blocking parts into C<sync_job>. This will run
294the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
295server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
296fast or be very important. 407fast or be very important.
299 410
300sub sync_job(&) { 411sub sync_job(&) {
301 my ($job) = @_; 412 my ($job) = @_;
302 413
303 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
304 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
306 419
307 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
308 # (but this is cancel-safe) 421 # (but this is cancel-safe)
319 432
320 while ($busy) { 433 while ($busy) {
321 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
322 } 435 }
323 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
324 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
325 } else { 445 } else {
326 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
327 447
328 $job->() 448 $job->()
347 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
348 468
349 $coro 469 $coro
350} 470}
351 471
352sub write_runtime { 472=item fork_call { }, $args
353 my $guard = cf::lock_acquire "write_runtime";
354 473
355 my $runtime = cf::localdir . "/runtime"; 474Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
356 478
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479=cut
358 or return;
359 480
360 my $value = $cf::RUNTIME + 90 + 10; 481sub fork_call(&@) {
361 # 10 is the runtime save interval, for a monotonic clock 482 my ($cb, @args) = @_;
362 # 60 allows for the watchdog to kill the server.
363 483
364 (aio_write $fh, 0, (length $value), $value, 0) <= 0 484 # we seemingly have to make a local copy of the whole thing,
365 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious)
366 487
367 # always fsync - this file is important 488 my @res = Coro::Util::fork_eval {
368 aio_fsync $fh 489 reset_signals;
369 and return; 490 &$cb
491 }, @args;
370 492
371 close $fh 493 wantarray ? @res : $res[-1]
372 or return; 494}
373 495
374 aio_rename "$runtime~", $runtime 496=item $value = cf::db_get $family => $key
375 and return;
376 497
498Returns a single value from the environment database.
499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
377 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
378} 610}
379 611
380=item cf::datalog type => key => value, ... 612=item cf::datalog type => key => value, ...
381 613
382Log a datalog packet of the given type with the given key-value pairs. 614Log a datalog packet of the given type with the given key-value pairs.
400attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
401to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
402 634
403In the following description, CLASS can be any of C<global>, C<object> 635In the following description, CLASS can be any of C<global>, C<object>
404C<player>, C<client> or C<map> (i.e. the attachable objects in 636C<player>, C<client> or C<map> (i.e. the attachable objects in
405crossfire+). 637Crossfire TRT).
406 638
407=over 4 639=over 4
408 640
409=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
410 642
573 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
574 806
575 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 811
580 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 813 my $pkg = shift @arg;
582 814
583 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
612 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
613 } 845 }
614 846
615 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
616 } else { 848 } else {
617 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
618 } 850 }
619 851
620 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
621} 853}
622 854
624 if (ref $_[0]) { 856 if (ref $_[0]) {
625 _object_attach @_; 857 _object_attach @_;
626 } else { 858 } else {
627 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
628 } 860 }
861 _recalc_want;
629}; 862};
630 863
631# all those should be optimised 864# all those should be optimised
632sub cf::attachable::detach { 865sub cf::attachable::detach {
633 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
636 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
637 reattach ($obj); 870 reattach ($obj);
638 } else { 871 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
640 } 873 }
874 _recalc_want;
641}; 875};
642 876
643sub cf::attachable::attached { 877sub cf::attachable::attached {
644 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
645 879
660 "; 894 ";
661 die if $@; 895 die if $@;
662} 896}
663 897
664our $override; 898our $override;
665our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
666 900
667sub override { 901sub override {
668 $override = 1; 902 $override = 1;
669 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
670} 904}
671 905
672sub do_invoke { 906sub do_invoke {
673 my $event = shift; 907 my $event = shift;
674 my $callbacks = shift; 908 my $callbacks = shift;
675 909
676 @invoke_results = (); 910 @INVOKE_RESULTS = ();
677 911
678 local $override; 912 local $override;
679 913
680 for (@$callbacks) { 914 for (@$callbacks) {
681 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
698 932
699Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
700 934
701This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
702removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
703results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
704 938
705=back 939=back
706 940
707=cut 941=cut
708 942
709############################################################################# 943#############################################################################
710# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
711 956
712sub reattach { 957sub reattach {
713 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
714 my ($obj) = @_; 959 my ($obj) = @_;
715 960
818 or return; 1063 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 1064 $av = eval { (Storable::thaw $av)->{objs} };
820 } 1065 }
821 1066
822 warn sprintf "loading %s (%d)\n", 1067 warn sprintf "loading %s (%d)\n",
823 $filename, length $data, scalar @{$av || []};#d# 1068 $filename, length $data, scalar @{$av || []};
824 return ($data, $av); 1069 return ($data, $av);
825} 1070}
1071
1072=head2 COMMAND CALLBACKS
1073
1074=over 4
1075
1076=cut
826 1077
827############################################################################# 1078#############################################################################
828# command handling &c 1079# command handling &c
829 1080
830=item cf::register_command $name => \&callback($ob,$args); 1081=item cf::register_command $name => \&callback($ob,$args);
843 push @{ $COMMAND{$name} }, [$caller, $cb]; 1094 push @{ $COMMAND{$name} }, [$caller, $cb];
844} 1095}
845 1096
846=item cf::register_extcmd $name => \&callback($pl,$packet); 1097=item cf::register_extcmd $name => \&callback($pl,$packet);
847 1098
848Register a callbackf ro execution when the client sends an extcmd packet. 1099Register a callback for execution when the client sends an (synchronous)
1100extcmd packet. Ext commands will be processed in the order they are
1101received by the server, like other user commands. The first argument is
1102the logged-in player. Ext commands can only be processed after a player
1103has logged in successfully.
849 1104
850If the callback returns something, it is sent back as if reply was being 1105If the callback returns something, it is sent back as if reply was being
851called. 1106called.
852 1107
1108=item cf::register_exticmd $name => \&callback($ns,$packet);
1109
1110Register a callback for execution when the client sends an (asynchronous)
1111exticmd packet. Exti commands are processed by the server as soon as they
1112are received, i.e. out of order w.r.t. other commands. The first argument
1113is a client socket. Exti commands can be received anytime, even before
1114log-in.
1115
1116If the callback returns something, it is sent back as if reply was being
1117called.
1118
853=cut 1119=cut
854 1120
855sub register_extcmd { 1121sub register_extcmd {
856 my ($name, $cb) = @_; 1122 my ($name, $cb) = @_;
857 1123
858 $EXTCMD{$name} = $cb; 1124 $EXTCMD{$name} = $cb;
1125}
1126
1127sub register_exticmd {
1128 my ($name, $cb) = @_;
1129
1130 $EXTICMD{$name} = $cb;
859} 1131}
860 1132
861cf::player->attach ( 1133cf::player->attach (
862 on_command => sub { 1134 on_command => sub {
863 my ($pl, $name, $params) = @_; 1135 my ($pl, $name, $params) = @_;
872 cf::override; 1144 cf::override;
873 }, 1145 },
874 on_extcmd => sub { 1146 on_extcmd => sub {
875 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
876 1148
877 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
878 1150
879 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
880 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
881 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
882 $pl->ext_reply ($msg->{msgid}, %reply);
883 }
884 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
885 } else { 1166 } else {
886 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
887 } 1168 }
888 1169
889 cf::override; 1170 cf::override;
890 }, 1171 },
891); 1172);
892 1173
893sub load_extension {
894 my ($path) = @_;
895
896 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
897 my $base = $1;
898 my $pkg = $1;
899 $pkg =~ s/[^[:word:]]/_/g;
900 $pkg = "ext::$pkg";
901
902 warn "... loading '$path' into '$pkg'\n";
903
904 open my $fh, "<:utf8", $path
905 or die "$path: $!";
906
907 my $source =
908 "package $pkg; use strict; use utf8;\n"
909 . "#line 1 \"$path\"\n{\n"
910 . (do { local $/; <$fh> })
911 . "\n};\n1";
912
913 unless (eval $source) {
914 my $msg = $@ ? "$path: $@\n"
915 : "extension disabled.\n";
916 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
917 warn $@;
918 warn "mandatory extension failed to load, exiting.\n";
919 exit 1;
920 }
921 die $@;
922 }
923
924 push @EXTS, $pkg;
925}
926
927sub load_extensions { 1174sub load_extensions {
1175 cf::sync_job {
1176 my %todo;
1177
928 for my $ext (<$LIBDIR/*.ext>) { 1178 for my $path (<$LIBDIR/*.ext>) {
929 next unless -r $ext; 1179 next unless -r $path;
930 eval { 1180
931 load_extension $ext; 1181 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1182 my $base = $1;
1183 my $pkg = $1;
1184 $pkg =~ s/[^[:word:]]/_/g;
1185 $pkg = "ext::$pkg";
1186
1187 open my $fh, "<:utf8", $path
1188 or die "$path: $!";
1189
1190 my $source = do { local $/; <$fh> };
1191
1192 my %ext = (
1193 path => $path,
1194 base => $base,
1195 pkg => $pkg,
1196 );
1197
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200
1201 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n"
1204 . $source
1205 . "\n};\n1";
1206
1207 $todo{$base} = \%ext;
1208 }
1209
1210 my %done;
1211 while (%todo) {
1212 my $progress;
1213
1214 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip
1217 unless exists $done{$_};
1218 }
1219
1220 warn "... loading '$k' into '$v->{pkg}'\n";
1221
1222 unless (eval $v->{source}) {
1223 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n";
1225
1226 if (exists $v->{meta}{mandatory}) {
1227 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n";
1229 exit 1;
1230 }
1231
1232 warn $msg;
1233 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
932 1 1238 }
933 } or warn "$ext not loaded: $@"; 1239
1240 skip:
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1242 unless $progress;
1243 }
934 } 1244 };
935} 1245}
936 1246
937############################################################################# 1247#############################################################################
938 1248
1249=back
1250
939=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
940 1252
941Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
942 1254
943=cut 1255=cut
955Returns the given player object, loading it if necessary (might block). 1267Returns the given player object, loading it if necessary (might block).
956 1268
957=cut 1269=cut
958 1270
959sub playerdir($) { 1271sub playerdir($) {
960 cf::localdir 1272 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1273 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1274}
966 1275
967sub path($) { 1276sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1277 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1016 1325
1017 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1018 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1019 1328
1020 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1021 Coro::cede; 1330 cf::cede_to_tick;
1022} 1331}
1023 1332
1024sub new($) { 1333sub new($) {
1025 my ($login) = @_; 1334 my ($login) = @_;
1026 1335
1030 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1031 1340
1032 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1033 1342
1034 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1035} 1354}
1036 1355
1037=item $pl->quit_character 1356=item $pl->quit_character
1038 1357
1039Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1088while and may block, so not sync_job-capable, ever. 1407while and may block, so not sync_job-capable, ever.
1089 1408
1090=cut 1409=cut
1091 1410
1092sub list_logins { 1411sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1412 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1413 or return [];
1095 1414
1096 my @logins; 1415 my @logins;
1097 1416
1098 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1133 } 1452 }
1134 1453
1135 \@paths 1454 \@paths
1136} 1455}
1137 1456
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1458
1459Expand crossfire pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGHT])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1478 # replace G<male|female> tags
1479 || s{G<([^>|]*)\|([^>]*)>}{
1480 $self->gender ? $2 : $1
1481 }ge
1482 # replace H<hint text>
1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1490
1491 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g;
1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1500 $_
1501}
1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507
1138=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1139 1509
1140Sends an ext reply to the player. 1510Sends an ext reply to the player.
1141 1511
1142=cut 1512=cut
1143 1513
1144sub ext_reply($$%) { 1514sub ext_reply($$@) {
1145 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1146 1516
1147 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1148
1149 $self->send ("ext " . cf::to_json \%msg);
1150} 1518}
1151 1519
1152=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1153 1521
1154Sends an ext event to the client. 1522Sends an ext event to the client.
1155 1523
1156=cut 1524=cut
1157 1525
1158sub ext_event($$%) { 1526sub ext_msg($$@) {
1159 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1160 1528
1161 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1162} 1530}
1163 1531
1164=head3 cf::region 1532=head3 cf::region
1165 1533
1166=over 4 1534=over 4
1169 1537
1170package cf::region; 1538package cf::region;
1171 1539
1172=item cf::region::find_by_path $path 1540=item cf::region::find_by_path $path
1173 1541
1174Tries to decuce the probable region for a map knowing only its path. 1542Tries to decuce the likely region for a map knowing only its path.
1175 1543
1176=cut 1544=cut
1177 1545
1178sub find_by_path($) { 1546sub find_by_path($) {
1179 my ($path) = @_; 1547 my ($path) = @_;
1180 1548
1181 my ($match, $specificity); 1549 my ($match, $specificity);
1182 1550
1183 for my $region (list) { 1551 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) { 1552 if ($region->{match} && $path =~ $region->{match}) {
1185 ($match, $specificity) = ($region, $region->specificity) 1553 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity; 1554 if $region->specificity > $specificity;
1187 } 1555 }
1188 } 1556 }
1189 1557
1253 my ($self, $merge) = @_; 1621 my ($self, $merge) = @_;
1254 1622
1255 # we have to keep some variables in memory intact 1623 # we have to keep some variables in memory intact
1256 local $self->{path}; 1624 local $self->{path};
1257 local $self->{load_path}; 1625 local $self->{load_path};
1258 local $self->{deny_save};
1259 local $self->{deny_reset};
1260 1626
1261 $self->SUPER::thawer_merge ($merge); 1627 $self->SUPER::thawer_merge ($merge);
1262} 1628}
1263 1629
1264sub normalise { 1630sub normalise {
1311 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1312 return $self; 1678 return $self;
1313 } 1679 }
1314 } 1680 }
1315 1681
1316 Carp::carp "unable to resolve path '$path' (base '$base')."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1317 () 1683 ()
1318} 1684}
1319 1685
1320sub init { 1686sub init {
1321 my ($self) = @_; 1687 my ($self) = @_;
1336 1702
1337# the original (read-only) location 1703# the original (read-only) location
1338sub load_path { 1704sub load_path {
1339 my ($self) = @_; 1705 my ($self) = @_;
1340 1706
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1707 "$MAPDIR/$self->{path}.map"
1342} 1708}
1343 1709
1344# the temporary/swap location 1710# the temporary/swap location
1345sub save_path { 1711sub save_path {
1346 my ($self) = @_; 1712 my ($self) = @_;
1347 1713
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1715 "$TMPDIR/$path.map"
1350} 1716}
1351 1717
1352# the unique path, undef == no special unique path 1718# the unique path, undef == no special unique path
1353sub uniq_path { 1719sub uniq_path {
1354 my ($self) = @_; 1720 my ($self) = @_;
1355 1721
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1723 "$UNIQUEDIR/$path"
1358} 1724}
1359 1725
1360# and all this just because we cannot iterate over 1726# and all this just because we cannot iterate over
1361# all maps in C++... 1727# all maps in C++...
1362sub change_all_map_light { 1728sub change_all_map_light {
1363 my ($change) = @_; 1729 my ($change) = @_;
1364 1730
1365 $_->change_map_light ($change) 1731 $_->change_map_light ($change)
1366 for grep $_->outdoor, values %cf::MAP; 1732 for grep $_->outdoor, values %cf::MAP;
1733}
1734
1735sub decay_objects {
1736 my ($self) = @_;
1737
1738 return if $self->{deny_reset};
1739
1740 $self->do_decay_objects;
1367} 1741}
1368 1742
1369sub unlink_save { 1743sub unlink_save {
1370 my ($self) = @_; 1744 my ($self) = @_;
1371 1745
1429 $self->load_header_orig 1803 $self->load_header_orig
1430 or return; 1804 or return;
1431 $self->prepare_orig; 1805 $self->prepare_orig;
1432 } 1806 }
1433 1807
1808 $self->{deny_reset} = 1
1809 if $self->no_reset;
1810
1434 $self->default_region (cf::region::find_by_path $self->{path}) 1811 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region; 1812 unless $self->default_region;
1436 1813
1437 1 1814 1
1438} 1815}
1453 $map->{last_save} = $cf::RUNTIME; 1830 $map->{last_save} = $cf::RUNTIME;
1454 1831
1455 $map->load_header 1832 $map->load_header
1456 or return; 1833 or return;
1457 1834
1458 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1459 # doing this can freeze the server in a sync job, obviously 1836 # doing this can freeze the server in a sync job, obviously
1460 #$cf::WAIT_FOR_TICK->wait; 1837 #$cf::WAIT_FOR_TICK->wait;
1461 $map->reset; 1838 $map->reset;
1462 undef $guard; 1839 undef $guard;
1463 return find $path; 1840 return find $path;
1474 my ($self) = @_; 1851 my ($self) = @_;
1475 1852
1476 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1477 1854
1478 my $path = $self->{path}; 1855 my $path = $self->{path};
1856
1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1479 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1480 1860
1481 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1482 1862
1483 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1484 1864
1485 $self->alloc; 1865 $self->alloc;
1486 1866
1487 $self->pre_load; 1867 $self->pre_load;
1488 Coro::cede; 1868 cf::cede_to_tick;
1489 1869
1490 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1491 or return; 1871 or return;
1492 1872
1493 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1494 if delete $self->{load_original}; 1874 if delete $self->{load_original};
1495 1875
1496 if (my $uniq = $self->uniq_path) { 1876 if (my $uniq = $self->uniq_path) {
1497 utf8::encode $uniq; 1877 utf8::encode $uniq;
1498 if (aio_open $uniq, O_RDONLY, 0) { 1878 if (aio_open $uniq, O_RDONLY, 0) {
1499 $self->clear_unique_items; 1879 $self->clear_unique_items;
1500 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1501 } 1881 }
1502 } 1882 }
1503 1883
1504 Coro::cede; 1884 cf::cede_to_tick;
1505 # now do the right thing for maps 1885 # now do the right thing for maps
1506 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1507 Coro::cede;
1508
1509 unless ($self->{deny_activate}) {
1510 $self->decay_objects;
1511 $self->fix_auto_apply;
1512 $self->update_buttons;
1513 Coro::cede;
1514 $self->set_darkness_map;
1515 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1516 unless $self->difficulty; 1888 unless $self->difficulty;
1517 Coro::cede; 1889 cf::cede_to_tick;
1890
1891 unless ($self->{deny_activate}) {
1892 $self->decay_objects;
1893 $self->fix_auto_apply;
1894 $self->update_buttons;
1895 cf::cede_to_tick;
1896 $self->set_darkness_map;
1897 cf::cede_to_tick;
1518 $self->activate; 1898 $self->activate;
1519 Coro::cede; 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1903
1904 $self->in_memory (cf::MAP_IN_MEMORY);
1520 } 1905 }
1521 1906
1522 $self->post_load; 1907 $self->post_load;
1523 Coro::cede;
1524
1525 $self->in_memory (cf::MAP_IN_MEMORY);
1526} 1908}
1527 1909
1528sub customise_for { 1910sub customise_for {
1529 my ($self, $ob) = @_; 1911 my ($self, $ob) = @_;
1530 1912
1531 return find "~" . $ob->name . "/" . $self->{path} 1913 return find "~" . $ob->name . "/" . $self->{path}
1532 if $self->per_player; 1914 if $self->per_player;
1533 1915
1916# return find "?party/" . $ob->name . "/" . $self->{path}
1917# if $self->per_party;
1918
1534 $self 1919 $self
1535} 1920}
1536 1921
1537# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1538sub load_diag { 1923sub load_neighbours {
1539 my ($map) = @_; 1924 my ($map) = @_;
1540 1925
1541 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1542 1927
1543 for (0 .. 3) { 1928 for (0 .. 3) {
1544 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1545 or next; 1930 or next;
1546 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1547 or next; 1932 or next;
1548 $neigh->load; 1933 $neigh->load;
1549 1934
1935 push @neigh,
1550 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1551 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1552 } 1938 }
1553 1939
1554 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1555 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1556 or next; 1943 or next;
1557 $neigh->load; 1944 $neigh->load;
1558 } 1945 }
1559} 1946}
1560 1947
1565} 1952}
1566 1953
1567sub do_load_sync { 1954sub do_load_sync {
1568 my ($map) = @_; 1955 my ($map) = @_;
1569 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1570 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1571} 1961}
1572 1962
1573our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1574our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1575 1965
1576sub find_async { 1966sub find_async {
1577 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1578 1968
1579 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1580 1970
1581 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1582 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1583 } 1973 }
1584 1974
1585 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1586 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1587 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1588 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1589 my $map = find $path 1980 if (my $map = find $k) {
1590 or next;
1591 $map->load; 1981 $map->load if $v;
1982 }
1592 1983
1593 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1594 } 1985 }
1595 } 1986 }
1596 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1597 }; 1988 };
1598 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
1601} 1992}
1602 1993
1603sub save { 1994sub save {
1604 my ($self) = @_; 1995 my ($self) = @_;
1605 1996
1606 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1607 1998
1608 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1609 2000
1610 return unless $self->dirty; 2001 return unless $self->dirty;
1611 2002
1634 my ($self) = @_; 2025 my ($self) = @_;
1635 2026
1636 # save first because save cedes 2027 # save first because save cedes
1637 $self->save; 2028 $self->save;
1638 2029
1639 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1640 2031
1641 return if $self->players; 2032 return if $self->players;
1642 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1643 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1644 2035
1648 2039
1649sub reset_at { 2040sub reset_at {
1650 my ($self) = @_; 2041 my ($self) = @_;
1651 2042
1652 # TODO: safety, remove and allow resettable per-player maps 2043 # TODO: safety, remove and allow resettable per-player maps
1653 return 1e99 if $self->isa ("ext::map_per_player");#d#
1654 return 1e99 if $self->{deny_reset}; 2044 return 1e99 if $self->{deny_reset};
1655 2045
1656 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2046 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1657 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2047 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1658 2048
1669 my ($self) = @_; 2059 my ($self) = @_;
1670 2060
1671 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2061 my $lock = cf::lock_acquire "map_data:$self->{path}";
1672 2062
1673 return if $self->players; 2063 return if $self->players;
1674 return if $self->isa ("ext::map_per_player");#d#
1675 2064
1676 warn "resetting map ", $self->path;#d# 2065 warn "resetting map ", $self->path;
1677 2066
1678 $self->in_memory (cf::MAP_SWAPPED); 2067 $self->in_memory (cf::MAP_SWAPPED);
1679 2068
1680 # need to save uniques path 2069 # need to save uniques path
1681 unless ($self->{deny_save}) { 2070 unless ($self->{deny_save}) {
1698my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
1699 2088
1700sub nuke { 2089sub nuke {
1701 my ($self) = @_; 2090 my ($self) = @_;
1702 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
1703 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
1704 2096
1705 $self->unlink_save; 2097 $self->unlink_save;
1706 2098
1707 bless $self, "cf::map"; 2099 bless $self, "cf::map";
1708 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
1709 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
1710 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
1711 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1712 2104
1713 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
1714 2107
1715 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2109}
2110
2111=item $maps = cf::map::tmp_maps
2112
2113Returns an arrayref with all map paths of currently instantiated and saved
2114maps. May block.
2115
2116=cut
2117
2118sub tmp_maps() {
2119 [
2120 map {
2121 utf8::decode $_;
2122 /\.map$/
2123 ? normalise $_
2124 : ()
2125 } @{ aio_readdir $TMPDIR or [] }
2126 ]
2127}
2128
2129=item $maps = cf::map::random_maps
2130
2131Returns an arrayref with all map paths of currently instantiated and saved
2132random maps. May block.
2133
2134=cut
2135
2136sub random_maps() {
2137 [
2138 map {
2139 utf8::decode $_;
2140 /\.map$/
2141 ? normalise "?random/$_"
2142 : ()
2143 } @{ aio_readdir $RANDOMDIR or [] }
2144 ]
1716} 2145}
1717 2146
1718=item cf::map::unique_maps 2147=item cf::map::unique_maps
1719 2148
1720Returns an arrayref of paths of all shared maps that have 2149Returns an arrayref of paths of all shared maps that have
1721instantiated unique items. May block. 2150instantiated unique items. May block.
1722 2151
1723=cut 2152=cut
1724 2153
1725sub unique_maps() { 2154sub unique_maps() {
1726 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2155 [
1727 or return; 2156 map {
1728
1729 my @paths;
1730
1731 for (@$files) {
1732 utf8::decode $_; 2157 utf8::decode $_;
1733 next if /\.pst$/; 2158 /\.map$/
1734 next unless /^$PATH_SEP/o; 2159 ? normalise $_
1735 2160 : ()
1736 push @paths, cf::map::normalise $_; 2161 } @{ aio_readdir $UNIQUEDIR or [] }
1737 } 2162 ]
1738
1739 \@paths
1740} 2163}
1741 2164
1742package cf; 2165package cf;
1743 2166
1744=back 2167=back
1790 2213
1791 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2214 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1792 2215
1793 if ($self->{record_replies}) { 2216 if ($self->{record_replies}) {
1794 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2217 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2218
1795 } else { 2219 } else {
2220 my $pl = $self->contr;
2221
2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2223 my $dialog = $pl->{npc_dialog};
2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2225
2226 } else {
1796 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
1797 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2229 }
1798 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
1799} 2241}
1800 2242
1801=item $player_object->may ("access") 2243=item $player_object->may ("access")
1802 2244
1803Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
1850 $self->deactivate_recursive; 2292 $self->deactivate_recursive;
1851 2293
1852 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2294 return if UNIVERSAL::isa $self->map, "ext::map_link";
1853 2295
1854 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2296 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1855 if $self->map; 2297 if $self->map && $self->map->{path} ne "{link}";
1856 2298
1857 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2299 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1858} 2300}
1859 2301
1860sub cf::object::player::leave_link { 2302sub cf::object::player::leave_link {
1861 my ($self, $map, $x, $y) = @_; 2303 my ($self, $map, $x, $y) = @_;
2304
2305 return unless $self->contr->active;
1862 2306
1863 my $link_pos = delete $self->{_link_pos}; 2307 my $link_pos = delete $self->{_link_pos};
1864 2308
1865 unless ($map) { 2309 unless ($map) {
1866 # restore original map position 2310 # restore original map position
1880 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
1881 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
1882 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
1883 2327
1884 $map->load; 2328 $map->load;
1885 $map->load_diag; 2329 $map->load_neighbours;
1886 2330
1887 return unless $self->contr->active; 2331 return unless $self->contr->active;
1888 $self->activate_recursive; 2332 $self->activate_recursive;
1889 2333
1890 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1891 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
1892} 2336}
1893 2337
1894cf::player->attach ( 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1895 on_logout => sub {
1896 my ($pl) = @_;
1897 2339
1898 # abort map switching before logout 2340Moves the player to the given map-path and coordinates by first freezing
1899 if ($pl->ob->{_link_pos}) { 2341her, loading and preparing them map, calling the provided $check callback
1900 cf::sync_job { 2342that has to return the map if sucecssful, and then unfreezes the player on
1901 $pl->ob->leave_link 2343the new (success) or old (failed) map position. In either case, $done will
1902 }; 2344be called at the end of this process.
1903 }
1904 },
1905 on_login => sub {
1906 my ($pl) = @_;
1907 2345
1908 # try to abort aborted map switching on player login :)
1909 # should happen only on crashes
1910 if ($pl->ob->{_link_pos}) {
1911 $pl->ob->enter_link;
1912 (async {
1913 $pl->ob->reply (undef,
1914 "There was an internal problem at your last logout, "
1915 . "the server will try to bring you to your intended destination in a second.",
1916 cf::NDI_RED);
1917 # we need this sleep as the login has a concurrent enter_exit running
1918 # and this sleep increases chances of the player not ending up in scorn
1919 Coro::Timer::sleep 1;
1920 $pl->ob->leave_link;
1921 })->prio (2);
1922 }
1923 },
1924);
1925
1926=item $player_object->goto ($path, $x, $y)
1927
1928=cut 2346=cut
2347
2348our $GOTOGEN;
1929 2349
1930sub cf::object::player::goto { 2350sub cf::object::player::goto {
1931 my ($self, $path, $x, $y) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2352
2353 # do generation counting so two concurrent goto's will be executed in-order
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1932 2355
1933 $self->enter_link; 2356 $self->enter_link;
1934 2357
1935 (async { 2358 (async {
1936 my $map = eval { 2359 my $map = eval {
1937 my $map = cf::map::find $path; 2360 my $map = cf::map::find $path;
2361
2362 if ($map) {
1938 $map = $map->customise_for ($self) if $map; 2363 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map;
2365 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2367 }
2368
1939 $map 2369 $map
2370 };
2371
2372 if ($@) {
2373 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2374 LOG llevError | logBacktrace, Carp::longmess $@;
1940 } or 2375 }
1941 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1942 2376
2377 if ($gen == $self->{_goto_generation}) {
2378 delete $self->{_goto_generation};
1943 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2380 }
2381
2382 $done->() if $done;
1944 })->prio (1); 2383 })->prio (1);
1945} 2384}
1946 2385
1947=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
1948 2387
1987 2426
1988 $rmp->{random_seed} ||= $exit->random_seed; 2427 $rmp->{random_seed} ||= $exit->random_seed;
1989 2428
1990 my $data = cf::to_json $rmp; 2429 my $data = cf::to_json $rmp;
1991 my $md5 = Digest::MD5::md5_hex $data; 2430 my $md5 = Digest::MD5::md5_hex $data;
1992 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2431 my $meta = "$RANDOMDIR/$md5.meta";
1993 2432
1994 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1995 aio_write $fh, 0, (length $data), $data, 0; 2434 aio_write $fh, 0, (length $data), $data, 0;
1996 undef $fh; 2435 undef $fh;
1997 aio_rename "$meta~", $meta; 2436 aio_rename "$meta~", $meta;
2016 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2455 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2017 my $hp = $exit->stats->hp; 2456 my $hp = $exit->stats->hp;
2018 my $sp = $exit->stats->sp; 2457 my $sp = $exit->stats->sp;
2019 2458
2020 $self->enter_link; 2459 $self->enter_link;
2460
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
2021 2464
2022 (async { 2465 (async {
2023 $self->deactivate_recursive; # just to be sure 2466 $self->deactivate_recursive; # just to be sure
2024 unless (eval { 2467 unless (eval {
2025 $self->goto ($slaying, $hp, $sp); 2468 $self->goto ($slaying, $hp, $sp);
2053 2496
2054 utf8::encode $text; 2497 utf8::encode $text;
2055 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2056} 2499}
2057 2500
2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2502
2503Send a drawinfo or msg packet to the client, formatting the msg for the
2504client if neccessary. C<$type> should be a string identifying the type of
2505the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet.
2507
2508=cut
2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2525sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_;
2527
2528 $msg = $self->pl->expand_cfpod ($msg);
2529
2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel);
2540 }
2541
2542 $channel = $channel->{id};
2543 }
2544
2545 return unless @extra || length $msg;
2546
2547 if ($self->can_msg) {
2548 # default colour, mask it out
2549 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2550 if $color & cf::NDI_DEF;
2551
2552 $self->send_packet ("msg " . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2554 } else {
2555 if ($color >= 0) {
2556 # replace some tags by gcfclient-compatible ones
2557 for ($msg) {
2558 1 while
2559 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2560 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2561 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2562 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2564 }
2565
2566 $color &= cf::NDI_COLOR_MASK;
2567
2568 utf8::encode $msg;
2569
2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2573 } else {
2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2575 $self->send_packet ("drawinfo $color $msg")
2576 }
2577 }
2578 }
2579}
2580
2058=item $client->ext_event ($type, %msg) 2581=item $client->ext_msg ($type, @msg)
2059 2582
2060Sends an exti event to the client. 2583Sends an ext event to the client.
2061 2584
2062=cut 2585=cut
2063 2586
2064sub cf::client::ext_event($$%) { 2587sub cf::client::ext_msg($$@) {
2065 my ($self, $type, %msg) = @_; 2588 my ($self, $type, @msg) = @_;
2066 2589
2590 if ($self->extcmd == 2) {
2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2592 } elsif ($self->extcmd == 1) { # TODO: remove
2067 $msg{msgtype} = "event_$type"; 2593 push @msg, msgtype => "event_$type";
2068 $self->send_packet ("ext " . cf::to_json \%msg); 2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 }
2596}
2597
2598=item $client->ext_reply ($msgid, @msg)
2599
2600Sends an ext reply to the client.
2601
2602=cut
2603
2604sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_;
2606
2607 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id;
2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2613 }
2069} 2614}
2070 2615
2071=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
2072 2617
2073Queues a query to the client, calling the given callback with 2618Queues a query to the client, calling the given callback with
2074the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2619the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2075C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2620C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2076 2621
2077Queries can fail, so check the return code. Or don't, as queries will become 2622Queries can fail, so check the return code. Or don't, as queries will
2078reliable at some point in the future. 2623become reliable at some point in the future.
2079 2624
2080=cut 2625=cut
2081 2626
2082sub cf::client::query { 2627sub cf::client::query {
2083 my ($self, $flags, $text, $cb) = @_; 2628 my ($self, $flags, $text, $cb) = @_;
2091 utf8::encode $text; 2636 utf8::encode $text;
2092 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2637 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2093 2638
2094 $self->send_packet ($self->{query_queue}[0][0]) 2639 $self->send_packet ($self->{query_queue}[0][0])
2095 if @{ $self->{query_queue} } == 1; 2640 if @{ $self->{query_queue} } == 1;
2641
2642 1
2096} 2643}
2097 2644
2098cf::client->attach ( 2645cf::client->attach (
2646 on_connect => sub {
2647 my ($ns) = @_;
2648
2649 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2650 },
2099 on_reply => sub { 2651 on_reply => sub {
2100 my ($ns, $msg) = @_; 2652 my ($ns, $msg) = @_;
2101 2653
2102 # this weird shuffling is so that direct followup queries 2654 # this weird shuffling is so that direct followup queries
2103 # get handled first 2655 # get handled first
2115 } else { 2667 } else {
2116 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2668 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2117 } 2669 }
2118 } 2670 }
2119 }, 2671 },
2672 on_exticmd => sub {
2673 my ($ns, $buf) = @_;
2674
2675 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2676
2677 if (ref $msg) {
2678 my ($type, $reply, @payload) =
2679 "ARRAY" eq ref $msg
2680 ? @$msg
2681 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2682
2683 my @reply;
2684
2685 if (my $cb = $EXTICMD{$type}) {
2686 @reply = $cb->($ns, @payload);
2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2692 } else {
2693 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2694 }
2695
2696 cf::override;
2697 },
2120); 2698);
2121 2699
2122=item $client->async (\&cb) 2700=item $client->async (\&cb)
2123 2701
2124Create a new coroutine, running the specified callback. The coroutine will 2702Create a new coroutine, running the specified callback. The coroutine will
2165our $safe = new Safe "safe"; 2743our $safe = new Safe "safe";
2166our $safe_hole = new Safe::Hole; 2744our $safe_hole = new Safe::Hole;
2167 2745
2168$SIG{FPE} = 'IGNORE'; 2746$SIG{FPE} = 'IGNORE';
2169 2747
2170$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2748$safe->permit_only (Opcode::opset qw(
2749 :base_core :base_mem :base_orig :base_math
2750 grepstart grepwhile mapstart mapwhile
2751 sort time
2752));
2171 2753
2172# here we export the classes and methods available to script code 2754# here we export the classes and methods available to script code
2173 2755
2174=pod 2756=pod
2175 2757
2176The following functions and methods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
2177 2759
2178 cf::object contr pay_amount pay_player map 2760 cf::object
2761 contr pay_amount pay_player map x y force_find force_add
2762 insert remove name archname title slaying race decrease_ob_nr
2763
2179 cf::object::player player 2764 cf::object::player
2180 cf::player peaceful 2765 player
2181 cf::map trigger 2766
2767 cf::player
2768 peaceful
2769
2770 cf::map
2771 trigger
2182 2772
2183=cut 2773=cut
2184 2774
2185for ( 2775for (
2186 ["cf::object" => qw(contr pay_amount pay_player map)], 2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race
2778 decrease_ob_nr)],
2187 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2188 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2189 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2190) { 2782) {
2191 no strict 'refs'; 2783 no strict 'refs';
2262=back 2854=back
2263 2855
2264=cut 2856=cut
2265 2857
2266############################################################################# 2858#############################################################################
2267
2268=head2 EXTENSION DATABASE SUPPORT
2269
2270Crossfire maintains a very simple database for extension use. It can
2271currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2272convert to/from binary).
2273
2274The parameter C<$family> should best start with the name of the extension
2275using it, it should be unique.
2276
2277=over 4
2278
2279=item $value = cf::db_get $family => $key
2280
2281Returns a single value from the database.
2282
2283=item cf::db_put $family => $key => $value
2284
2285Stores the given C<$value> in the family.
2286
2287=cut
2288
2289our $DB;
2290
2291sub db_init {
2292 unless ($DB) {
2293 $DB = BDB::db_create $DB_ENV;
2294
2295 cf::sync_job {
2296 eval {
2297 $DB->set_flags (BDB::CHKSUM);
2298
2299 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2300 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2301 cf::cleanup "db_open(db): $!" if $!;
2302 };
2303 cf::cleanup "db_open(db): $@" if $@;
2304 };
2305 }
2306}
2307
2308sub db_get($$) {
2309 my $key = "$_[0]/$_[1]";
2310
2311 cf::sync_job {
2312 BDB::db_get $DB, undef, $key, my $data;
2313
2314 $! ? ()
2315 : $data
2316 }
2317}
2318
2319sub db_put($$$) {
2320 BDB::dbreq_pri 4;
2321 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2322}
2323
2324=item cf::cache $id => [$paths...], $processversion => $process
2325
2326Generic caching function that returns the value of the resource $id,
2327caching and regenerating as required.
2328
2329This function can block.
2330
2331=cut
2332
2333sub cache {
2334 my ($id, $src, $processversion, $process) = @_;
2335
2336 my $meta =
2337 join "\x00",
2338 $processversion,
2339 map {
2340 aio_stat $_
2341 and Carp::croak "$_: $!";
2342
2343 ($_, (stat _)[7,9])
2344 } @$src;
2345
2346 my $dbmeta = db_get cache => "$id/meta";
2347 if ($dbmeta ne $meta) {
2348 # changed, we may need to process
2349
2350 my @data;
2351 my $md5;
2352
2353 for (0 .. $#$src) {
2354 0 <= aio_load $src->[$_], $data[$_]
2355 or Carp::croak "$src->[$_]: $!";
2356 }
2357
2358 # if processing is expensive, check
2359 # checksum first
2360 if (1) {
2361 $md5 =
2362 join "\x00",
2363 $processversion,
2364 map {
2365 Coro::cede;
2366 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2367 } 0.. $#$src;
2368
2369
2370 my $dbmd5 = db_get cache => "$id/md5";
2371 if ($dbmd5 eq $md5) {
2372 db_put cache => "$id/meta", $meta;
2373
2374 return db_get cache => "$id/data";
2375 }
2376 }
2377
2378 my $data = $process->(\@data);
2379
2380 db_put cache => "$id/data", $data;
2381 db_put cache => "$id/md5" , $md5;
2382 db_put cache => "$id/meta", $meta;
2383
2384 return $data;
2385 }
2386
2387 db_get cache => "$id/data"
2388}
2389
2390=item fork_call { }, $args
2391
2392Executes the given code block with the given arguments in a seperate
2393process, returning the results. Everything must be serialisable with
2394Coro::Storable. May, of course, block. Note that the executed sub may
2395never block itself or use any form of Event handling.
2396
2397=cut
2398
2399sub fork_call(&@) {
2400 my ($cb, @args) = @_;
2401
2402# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2403# or die "socketpair: $!";
2404 pipe my $fh1, my $fh2
2405 or die "pipe: $!";
2406
2407 if (my $pid = fork) {
2408 close $fh2;
2409
2410 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2411 $res = Coro::Storable::thaw $res;
2412
2413 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2414
2415 die $$res unless "ARRAY" eq ref $res;
2416
2417 return wantarray ? @$res : $res->[-1];
2418 } else {
2419 eval {
2420 local $SIG{__DIE__};
2421 local $SIG{__WARN__};
2422 close $fh1;
2423
2424 my @res = eval { $cb->(@args) };
2425 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426 };
2427
2428 _exit 0;
2429 }
2430}
2431
2432
2433
2434#############################################################################
2435# the server's init and main functions 2859# the server's init and main functions
2436 2860
2437sub load_facedata($) { 2861sub load_facedata($) {
2438 my ($path) = @_; 2862 my ($path) = @_;
2863
2864 # HACK to clear player env face cache, we need some signal framework
2865 # for this (global event?)
2866 %ext::player_env::MUSIC_FACE_CACHE = ();
2867
2868 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2439 2869
2440 warn "loading facedata from $path\n"; 2870 warn "loading facedata from $path\n";
2441 2871
2442 my $facedata; 2872 my $facedata;
2443 0 < aio_load $path, $facedata 2873 0 < aio_load $path, $facedata
2446 $facedata = Coro::Storable::thaw $facedata; 2876 $facedata = Coro::Storable::thaw $facedata;
2447 2877
2448 $facedata->{version} == 2 2878 $facedata->{version} == 2
2449 or cf::cleanup "$path: version mismatch, cannot proceed."; 2879 or cf::cleanup "$path: version mismatch, cannot proceed.";
2450 2880
2881 # patch in the exptable
2882 $facedata->{resource}{"res/exp_table"} = {
2883 type => FT_RSRC,
2884 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2885 };
2886 cf::cede_to_tick;
2887
2451 { 2888 {
2452 my $faces = $facedata->{faceinfo}; 2889 my $faces = $facedata->{faceinfo};
2453 2890
2454 while (my ($face, $info) = each %$faces) { 2891 while (my ($face, $info) = each %$faces) {
2455 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2456 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2893 cf::face::set_visibility $idx, $info->{visibility};
2894 cf::face::set_magicmap $idx, $info->{magicmap};
2457 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2458 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2459 Coro::cede; 2897
2898 cf::cede_to_tick;
2460 } 2899 }
2461 2900
2462 while (my ($face, $info) = each %$faces) { 2901 while (my ($face, $info) = each %$faces) {
2463 next unless $info->{smooth}; 2902 next unless $info->{smooth};
2464 my $idx = cf::face::find $face 2903 my $idx = cf::face::find $face
2465 or next; 2904 or next;
2466 if (my $smooth = cf::face::find $info->{smooth}) { 2905 if (my $smooth = cf::face::find $info->{smooth}) {
2906 cf::face::set_smooth $idx, $smooth;
2467 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2907 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2468 } else { 2908 } else {
2469 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2909 warn "smooth face '$info->{smooth}' not found for face '$face'";
2470 } 2910 }
2471 Coro::cede; 2911
2912 cf::cede_to_tick;
2472 } 2913 }
2473 } 2914 }
2474 2915
2475 { 2916 {
2476 my $anims = $facedata->{animinfo}; 2917 my $anims = $facedata->{animinfo};
2477 2918
2478 while (my ($anim, $info) = each %$anims) { 2919 while (my ($anim, $info) = each %$anims) {
2479 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2920 cf::anim::set $anim, $info->{frames}, $info->{facings};
2480 Coro::cede; 2921 cf::cede_to_tick;
2481 } 2922 }
2482 2923
2483 cf::anim::invalidate_all; # d'oh 2924 cf::anim::invalidate_all; # d'oh
2484 } 2925 }
2485 2926
2927 {
2928 # TODO: for gcfclient pleasure, we should give resources
2929 # that gcfclient doesn't grok a >10000 face index.
2930 my $res = $facedata->{resource};
2931
2932 my $soundconf = delete $res->{"res/sound.conf"};
2933
2934 while (my ($name, $info) = each %$res) {
2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2937
2938 if ($info->{type} & 1) {
2939 # prepend meta info
2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2946 $data = pack "(w/a*)*", $meta, $info->{data};
2947 } else {
2948 $data = $info->{data};
2949 }
2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2954 cf::cede_to_tick;
2955 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2974 }
2975
2486 1 2976 1
2487} 2977}
2488 2978
2979register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_;
2981
2982 while (my ($k, $v) = each %$want) {
2983 $ns->fx_want ($k, $v);
2984 }
2985};
2986
2987sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2992 load_resource_file "$MAPDIR/regions"
2993 or die "unable to load regions file\n";
2994
2995 for (cf::region::list) {
2996 $_->{match} = qr/$_->{match}/
2997 if exists $_->{match};
2998 }
2999}
3000
2489sub reload_facedata { 3001sub reload_facedata {
2490 load_facedata sprintf "%s/facedata", cf::datadir 3002 load_facedata "$DATADIR/facedata"
2491 or die "unable to load facedata\n"; 3003 or die "unable to load facedata\n";
2492} 3004}
2493 3005
2494sub reload_regions {
2495 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2496 or die "unable to load regions file\n";
2497}
2498
2499sub reload_archetypes { 3006sub reload_archetypes {
2500 load_resource_file sprintf "%s/archetypes", cf::datadir 3007 load_resource_file "$DATADIR/archetypes"
2501 or die "unable to load archetypes\n"; 3008 or die "unable to load archetypes\n";
3009 #d# NEED to laod twice to resolve forward references
3010 # this really needs to be done in an extra post-pass
3011 # (which needs to be synchronous, so solve it differently)
3012 load_resource_file "$DATADIR/archetypes"
3013 or die "unable to load archetypes\n";
2502} 3014}
2503 3015
2504sub reload_treasures { 3016sub reload_treasures {
2505 load_resource_file sprintf "%s/treasures", cf::datadir 3017 load_resource_file "$DATADIR/treasures"
2506 or die "unable to load treasurelists\n"; 3018 or die "unable to load treasurelists\n";
2507} 3019}
2508 3020
2509sub reload_resources { 3021sub reload_resources {
2510 warn "reloading resource files...\n"; 3022 warn "reloading resource files...\n";
2511 3023
2512 reload_regions; 3024 reload_regions;
2513 reload_facedata; 3025 reload_facedata;
3026 #reload_archetypes;#d#
2514 reload_archetypes; 3027 reload_archetypes;
2515 reload_treasures; 3028 reload_treasures;
2516 3029
2517 warn "finished reloading resource files\n"; 3030 warn "finished reloading resource files\n";
2518} 3031}
2519 3032
2520sub init { 3033sub init {
2521 reload_resources; 3034 reload_resources;
2522} 3035}
2523 3036
2524sub cfg_load { 3037sub reload_config {
2525 open my $fh, "<:utf8", cf::confdir . "/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2526 or return; 3039 or return;
2527 3040
2528 local $/; 3041 local $/;
2529 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
2530 3043
2549 (async { 3062 (async {
2550 Event::one_event; 3063 Event::one_event;
2551 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
2552 }; 3065 };
2553 3066
2554 cfg_load; 3067 reload_config;
2555 db_init; 3068 db_init;
2556 load_extensions; 3069 load_extensions;
2557 3070
2558 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
2559 Event::loop; 3072 Event::loop;
2575 }, 3088 },
2576 ); 3089 );
2577 } 3090 }
2578} 3091}
2579 3092
3093sub write_runtime {
3094 my $runtime = "$LOCALDIR/runtime";
3095
3096 # first touch the runtime file to show we are still running:
3097 # the fsync below can take a very very long time.
3098
3099 IO::AIO::aio_utime $runtime, undef, undef;
3100
3101 my $guard = cf::lock_acquire "write_runtime";
3102
3103 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3104 or return;
3105
3106 my $value = $cf::RUNTIME + 90 + 10;
3107 # 10 is the runtime save interval, for a monotonic clock
3108 # 60 allows for the watchdog to kill the server.
3109
3110 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3111 and return;
3112
3113 # always fsync - this file is important
3114 aio_fsync $fh
3115 and return;
3116
3117 # touch it again to show we are up-to-date
3118 aio_utime $fh, undef, undef;
3119
3120 close $fh
3121 or return;
3122
3123 aio_rename "$runtime~", $runtime
3124 and return;
3125
3126 warn "runtime file written.\n";
3127
3128 1
3129}
3130
2580sub emergency_save() { 3131sub emergency_save() {
2581 my $freeze_guard = cf::freeze_mainloop; 3132 my $freeze_guard = cf::freeze_mainloop;
2582 3133
2583 warn "enter emergency perl save\n"; 3134 warn "enter emergency perl save\n";
2584 3135
2659 %EXT_CORO = (); 3210 %EXT_CORO = ();
2660 3211
2661 warn "removing commands"; 3212 warn "removing commands";
2662 %COMMAND = (); 3213 %COMMAND = ();
2663 3214
2664 warn "removing ext commands"; 3215 warn "removing ext/exti commands";
2665 %EXTCMD = (); 3216 %EXTCMD = ();
3217 %EXTICMD = ();
2666 3218
2667 warn "unloading/nuking all extensions"; 3219 warn "unloading/nuking all extensions";
2668 for my $pkg (@EXTS) { 3220 for my $pkg (@EXTS) {
2669 warn "... unloading $pkg"; 3221 warn "... unloading $pkg";
2670 3222
2700 Symbol::delete_package "safe::$_" 3252 Symbol::delete_package "safe::$_"
2701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3253 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2702 3254
2703 warn "unloading cf.pm \"a bit\""; 3255 warn "unloading cf.pm \"a bit\"";
2704 delete $INC{"cf.pm"}; 3256 delete $INC{"cf.pm"};
3257 delete $INC{"cf/pod.pm"};
2705 3258
2706 # don't, removes xs symbols, too, 3259 # don't, removes xs symbols, too,
2707 # and global variables created in xs 3260 # and global variables created in xs
2708 #Symbol::delete_package __PACKAGE__; 3261 #Symbol::delete_package __PACKAGE__;
2709 3262
2712 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
2713 require cf; 3266 require cf;
2714 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2715 3268
2716 warn "loading config and database again"; 3269 warn "loading config and database again";
2717 cf::cfg_load; 3270 cf::reload_config;
2718 3271
2719 warn "loading extensions"; 3272 warn "loading extensions";
2720 cf::load_extensions; 3273 cf::load_extensions;
2721 3274
2722 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";
2787 my $signal = new Coro::Signal; 3340 my $signal = new Coro::Signal;
2788 push @WAIT_FOR_TICK_BEGIN, $signal; 3341 push @WAIT_FOR_TICK_BEGIN, $signal;
2789 $signal->wait; 3342 $signal->wait;
2790} 3343}
2791 3344
3345 my $min = 1e6;#d#
3346 my $avg = 10;
2792$TICK_WATCHER = Event->timer ( 3347$TICK_WATCHER = Event->timer (
2793 reentrant => 0, 3348 reentrant => 0,
2794 parked => 1, 3349 parked => 1,
2795 prio => 0, 3350 prio => 0,
2796 at => $NEXT_TICK || $TICK, 3351 at => $NEXT_TICK || $TICK,
2800 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3355 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2801 unless ++$bug_warning > 10; 3356 unless ++$bug_warning > 10;
2802 return; 3357 return;
2803 } 3358 }
2804 3359
2805 $NOW = Event::time; 3360 $NOW = $tick_start = Event::time;
2806 3361
2807 cf::server_tick; # one server iteration 3362 cf::server_tick; # one server iteration
3363
3364 0 && sync_job {#d#
3365 for(1..10) {
3366 my $t = Event::time;
3367 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3368 or die;
3369
3370 $map->width (50);
3371 $map->height (50);
3372 $map->alloc;
3373 $map->_load_objects ("/tmp/x.map", 1);
3374 my $t = Event::time - $t;
3375
3376 #next unless $t < 0.0013;#d#
3377 if ($t < $min) {
3378 $min = $t;
3379 }
3380 $avg = $avg * 0.99 + $t * 0.01;
3381 }
3382 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3383 exit 0;
3384 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3385 };
2808 3386
2809 $RUNTIME += $TICK; 3387 $RUNTIME += $TICK;
2810 $NEXT_TICK += $TICK; 3388 $NEXT_TICK += $TICK;
2811 3389
2812 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3390 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2818 } 3396 }
2819 3397
2820# my $AFTER = Event::time; 3398# my $AFTER = Event::time;
2821# warn $AFTER - $NOW;#d# 3399# warn $AFTER - $NOW;#d#
2822 3400
3401 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3402 $sig->send;
3403 }
3404 while (my $sig = shift @WAIT_FOR_TICK) {
3405 $sig->send;
3406 }
3407
3408 $NOW = Event::time;
3409
2823 # if we are delayed by four ticks or more, skip them all 3410 # if we are delayed by four ticks or more, skip them all
2824 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3411 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2825 3412
2826 $TICK_WATCHER->at ($NEXT_TICK); 3413 $TICK_WATCHER->at ($NEXT_TICK);
2827 $TICK_WATCHER->start; 3414 $TICK_WATCHER->start;
2828 3415
2829 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3416 $LOAD = ($NOW - $tick_start) / $TICK;
2830 $sig->send; 3417 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2831 }
2832 while (my $sig = shift @WAIT_FOR_TICK) {
2833 $sig->send;
2834 }
2835 3418
2836 _post_tick; 3419 _post_tick;
3420
3421
2837 }, 3422 },
2838); 3423);
2839 3424
2840{ 3425{
2841 BDB::max_poll_time $TICK * 0.1; 3426 BDB::max_poll_time $TICK * 0.1;
2869 3454
2870 cf::sync_job { 3455 cf::sync_job {
2871 eval { 3456 eval {
2872 BDB::db_env_open 3457 BDB::db_env_open
2873 $DB_ENV, 3458 $DB_ENV,
2874 $BDB_ENV_DIR, 3459 $BDBDIR,
2875 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3460 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2876 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3461 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2877 0666; 3462 0666;
2878 3463
2879 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3464 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2880 3465
2881 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3466 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2882 $DB_ENV->set_lk_detect; 3467 $DB_ENV->set_lk_detect;
2883 }; 3468 };
2884 3469
2900 prio => 6, 3485 prio => 6,
2901 cb => \&IO::AIO::poll_cb, 3486 cb => \&IO::AIO::poll_cb,
2902 ); 3487 );
2903} 3488}
2904 3489
3490my $_log_backtrace;
3491
3492sub _log_backtrace {
3493 my ($msg, @addr) = @_;
3494
3495 $msg =~ s/\n//;
3496
3497 # limit the # of concurrent backtraces
3498 if ($_log_backtrace < 2) {
3499 ++$_log_backtrace;
3500 async {
3501 my @bt = fork_call {
3502 @addr = map { sprintf "%x", $_ } @addr;
3503 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3504 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3505 or die "addr2line: $!";
3506
3507 my @funcs;
3508 my @res = <$fh>;
3509 chomp for @res;
3510 while (@res) {
3511 my ($func, $line) = splice @res, 0, 2, ();
3512 push @funcs, "[$func] $line";
3513 }
3514
3515 @funcs
3516 };
3517
3518 LOG llevInfo, "[ABT] $msg\n";
3519 LOG llevInfo, "[ABT] $_\n" for @bt;
3520 --$_log_backtrace;
3521 };
3522 } else {
3523 LOG llevInfo, "[ABT] $msg\n";
3524 LOG llevInfo, "[ABT] [suppressed]\n";
3525 }
3526}
3527
2905# load additional modules 3528# load additional modules
2906use cf::pod; 3529use cf::pod;
2907 3530
2908END { cf::emergency_save } 3531END { cf::emergency_save }
2909 3532

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines