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.231 by root, Wed Apr 4 00:02:06 2007 UTC vs.
Revision 1.337 by root, Tue Aug 21 00:54:01 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.64 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
21 25
26use JSON::XS 1.4 ();
22use BDB (); 27use BDB ();
23use Data::Dumper; 28use Data::Dumper;
24use Digest::MD5; 29use Digest::MD5;
25use Fcntl; 30use Fcntl;
26use YAML::Syck (); 31use YAML::Syck ();
27use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
28use Time::HiRes; 33use Time::HiRes;
29use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
30 36
31# configure various modules to our taste 37# configure various modules to our taste
32# 38#
39$Storable::canonical = 1; # reduce rsync transfers
33Coro::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
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 42
36$Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
37 44
45our %COMMAND = (); 52our %COMMAND = ();
46our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
47 54
48our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
49our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
50our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
51our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
52 60
53our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
54our @EVENT; 62our @EVENT;
55our $LIBDIR = datadir . "/ext";
56 63
57our $TICK = MAX_TIME * 1e-6; 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";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58our $TICK_WATCHER; 77our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 80our $NEXT_TICK;
62our $NOW; 81our $NOW;
71our $RUNTIME; 90our $RUNTIME;
72 91
73our %PLAYER; # all users 92our %PLAYER; # all users
74our %MAP; # all maps 93our %MAP; # all maps
75our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
78
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81 95
82# 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 ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 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
85binmode STDOUT; 103binmode STDOUT;
86binmode STDERR; 104binmode STDERR;
87 105
88# read virtual server time, if available 106# read virtual server time, if available
89unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
91 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
92 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
93} 111}
94 112
95mkdir cf::localdir; 113mkdir $_
96mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
97mkdir cf::localdir . "/" . cf::tmpdir;
98mkdir cf::localdir . "/" . cf::uniquedir;
99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
101 115
102our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
103 117
104sub cf::map::normalise; 118sub cf::map::normalise;
105 119
116=item $cf::RUNTIME 130=item $cf::RUNTIME
117 131
118The 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
119every server tick. 133every server tick.
120 134
121=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
122 138
123The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
124be 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.
125 143
126=item $cf::NOW 144=item $cf::NOW
127 145
128The time of the last (current) server tick. 146The time of the last (current) server tick.
129 147
130=item $cf::TICK 148=item $cf::TICK
131 149
132The 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.
133 161
134=item %cf::CFG 162=item %cf::CFG
135 163
136Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 165from wherever your confdir points to.
138 166
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
140 168
141These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
143processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144window of cpu time available, or simply to synchronise to the server tick. 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.
145 178
146=back 179=back
147 180
148=cut 181=cut
149 182
150BEGIN { 183BEGIN {
151 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
152 my $msg = join "", @_; 185 my $msg = join "", @_;
153 utf8::encode $msg;
154 186
155 $msg .= "\n" 187 $msg .= "\n"
156 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
157 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
158 LOG llevError, $msg; 193 LOG llevError, $msg;
159 }; 194 };
160} 195}
161 196
162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
163@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
164@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
165@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
166@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';
167@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)
168 204
169# 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
170# within the Safe compartment. 206# within the Safe compartment.
171for my $pkg (qw( 207for my $pkg (qw(
172 cf::global cf::attachable 208 cf::global cf::attachable
180} 216}
181 217
182$Event::DIED = sub { 218$Event::DIED = sub {
183 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
184}; 220};
221
222#############################################################################
185 223
186=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
187 225
188=over 4 226=over 4
189 227
208 $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;
209 $d 247 $d
210 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
211} 249}
212 250
213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
214
215=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
216 252
217Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
218 254
219=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
220 256
221Converts 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]) }
222 265
223=item cf::lock_wait $string 266=item cf::lock_wait $string
224 267
225Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
226 269
232returned. 275returned.
233 276
234Lock names should begin with a unique identifier (for example, cf::map::find 277Lock names should begin with a unique identifier (for example, cf::map::find
235uses map_find and cf::map::load uses map_load). 278uses map_find and cf::map::load uses map_load).
236 279
280=item $locked = cf::lock_active $string
281
282Return true if the lock is currently active, i.e. somebody has locked it.
283
237=cut 284=cut
238 285
239our %LOCK; 286our %LOCK;
240 287
241sub lock_wait($) { 288sub lock_wait($) {
258 305
259 Coro::guard { 306 Coro::guard {
260 # wake up all waiters, to be on the safe side 307 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 308 $_->ready for @{ delete $LOCK{$key} };
262 } 309 }
310}
311
312sub lock_active($) {
313 my ($key) = @_;
314
315 ! ! $LOCK{$key}
263} 316}
264 317
265sub freeze_mainloop { 318sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 319 return unless $TICK_WATCHER->is_active;
267 320
270 }; 323 };
271 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
272 $guard 325 $guard
273} 326}
274 327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
382}
383
275=item cf::async { BLOCK } 384=item cf::async { BLOCK }
276 385
277Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
278C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 387C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
279thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
282 391
283BEGIN { *async = \&Coro::async_pool } 392BEGIN { *async = \&Coro::async_pool }
284 393
285=item cf::sync_job { BLOCK } 394=item cf::sync_job { BLOCK }
286 395
287The design of crossfire+ requires that the main coro ($Coro::main) is 396The design of Crossfire TRT requires that the main coroutine ($Coro::main)
288always able to handle events or runnable, as crossfire+ is only partly 397is always able to handle events or runnable, as Crossfire TRT is only
289reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable.
290 400
291If it must be done, put the blocking parts into C<sync_job>. This will run 401If it must be done, put the blocking parts into C<sync_job>. This will run
292the given BLOCK in another coroutine while waiting for the result. The 402the given BLOCK in another coroutine while waiting for the result. The
293server will be frozen during this time, so the block should either finish 403server will be frozen during this time, so the block should either finish
294fast or be very important. 404fast or be very important.
297 407
298sub sync_job(&) { 408sub sync_job(&) {
299 my ($job) = @_; 409 my ($job) = @_;
300 410
301 if ($Coro::current == $Coro::main) { 411 if ($Coro::current == $Coro::main) {
412 my $time = Event::time;
413
302 # this is the main coro, too bad, we have to block 414 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 415 # till the operation succeeds, freezing the server :/
304 416
305 # TODO: use suspend/resume instead 417 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 418 # (but this is cancel-safe)
317 429
318 while ($busy) { 430 while ($busy) {
319 Coro::cede or Event::one_event; 431 Coro::cede or Event::one_event;
320 } 432 }
321 433
434 $time = Event::time - $time;
435
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load
440
322 wantarray ? @res : $res[0] 441 wantarray ? @res : $res[0]
323 } else { 442 } else {
324 # we are in another coroutine, how wonderful, everything just works 443 # we are in another coroutine, how wonderful, everything just works
325 444
326 $job->() 445 $job->()
345 $EXT_CORO{$coro+0} = $coro; 464 $EXT_CORO{$coro+0} = $coro;
346 465
347 $coro 466 $coro
348} 467}
349 468
350sub write_runtime { 469=item fork_call { }, $args
351 my $guard = cf::lock_acquire "write_runtime";
352 470
353 my $runtime = cf::localdir . "/runtime"; 471Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling.
354 475
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 476=cut
356 or return;
357 477
358 my $value = $cf::RUNTIME + 90 + 10; 478sub fork_call(&@) {
359 # 10 is the runtime save interval, for a monotonic clock 479 my ($cb, @args) = @_;
360 # 60 allows for the watchdog to kill the server.
361 480
362 (aio_write $fh, 0, (length $value), $value, 0) <= 0 481 # we seemingly have to make a local copy of the whole thing,
363 and return; 482 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious)
364 484
365 # always fsync - this file is important 485 my @res = Coro::Util::fork_eval {
366 aio_fsync $fh 486 reset_signals;
367 and return; 487 &$cb
488 }, @args;
368 489
369 close $fh 490 wantarray ? @res : $res[-1]
370 or return; 491}
371 492
372 aio_rename "$runtime~", $runtime 493=item $value = cf::db_get $family => $key
373 and return;
374 494
495Returns a single value from the environment database.
496
497=item cf::db_put $family => $key => $value
498
499Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501
502=cut
503
504our $DB;
505
506sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job {
511 eval {
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
375 1 520 }
521}
522
523sub db_get($$) {
524 my $key = "$_[0]/$_[1]";
525
526 cf::sync_job {
527 BDB::db_get $DB, undef, $key, my $data;
528
529 $! ? ()
530 : $data
531 }
532}
533
534sub db_put($$$) {
535 BDB::dbreq_pri 4;
536 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
537}
538
539=item cf::cache $id => [$paths...], $processversion => $process
540
541Generic caching function that returns the value of the resource $id,
542caching and regenerating as required.
543
544This function can block.
545
546=cut
547
548sub cache {
549 my ($id, $src, $processversion, $process) = @_;
550
551 my $meta =
552 join "\x00",
553 $processversion,
554 map {
555 aio_stat $_
556 and Carp::croak "$_: $!";
557
558 ($_, (stat _)[7,9])
559 } @$src;
560
561 my $dbmeta = db_get cache => "$id/meta";
562 if ($dbmeta ne $meta) {
563 # changed, we may need to process
564
565 my @data;
566 my $md5;
567
568 for (0 .. $#$src) {
569 0 <= aio_load $src->[$_], $data[$_]
570 or Carp::croak "$src->[$_]: $!";
571 }
572
573 # if processing is expensive, check
574 # checksum first
575 if (1) {
576 $md5 =
577 join "\x00",
578 $processversion,
579 map {
580 Coro::cede;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src;
583
584
585 my $dbmd5 = db_get cache => "$id/md5";
586 if ($dbmd5 eq $md5) {
587 db_put cache => "$id/meta", $meta;
588
589 return db_get cache => "$id/data";
590 }
591 }
592
593 my $t1 = Time::HiRes::time;
594 my $data = $process->(\@data);
595 my $t2 = Time::HiRes::time;
596
597 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
598
599 db_put cache => "$id/data", $data;
600 db_put cache => "$id/md5" , $md5;
601 db_put cache => "$id/meta", $meta;
602
603 return $data;
604 }
605
606 db_get cache => "$id/data"
376} 607}
377 608
378=item cf::datalog type => key => value, ... 609=item cf::datalog type => key => value, ...
379 610
380Log a datalog packet of the given type with the given key-value pairs. 611Log a datalog packet of the given type with the given key-value pairs.
398attach callbacks/event handlers (a collection of which is called an "attachment") 629attach callbacks/event handlers (a collection of which is called an "attachment")
399to it. All such attachable objects support the following methods. 630to it. All such attachable objects support the following methods.
400 631
401In the following description, CLASS can be any of C<global>, C<object> 632In the following description, CLASS can be any of C<global>, C<object>
402C<player>, C<client> or C<map> (i.e. the attachable objects in 633C<player>, C<client> or C<map> (i.e. the attachable objects in
403crossfire+). 634Crossfire TRT).
404 635
405=over 4 636=over 4
406 637
407=item $attachable->attach ($attachment, key => $value...) 638=item $attachable->attach ($attachment, key => $value...)
408 639
571 $registry = $CB_TYPE[$object_type] ||= []; 802 $registry = $CB_TYPE[$object_type] ||= [];
572 803
573 } elsif ($type eq "subtype") { 804 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 805 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 806 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 807 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 808
578 } elsif ($type eq "package") { 809 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 810 my $pkg = shift @arg;
580 811
581 while (my ($name, $id) = each %cb_id) { 812 while (my ($name, $id) = each %cb_id) {
610 _attach $registry, $klass, @attach; 841 _attach $registry, $klass, @attach;
611 } 842 }
612 843
613 $obj->{$name} = \%arg; 844 $obj->{$name} = \%arg;
614 } else { 845 } else {
615 warn "object uses attachment '$name' that is not available, postponing.\n"; 846 warn "object uses attachment '$name' which is not available, postponing.\n";
616 } 847 }
617 848
618 $obj->{_attachment}{$name} = undef; 849 $obj->{_attachment}{$name} = undef;
619} 850}
620 851
622 if (ref $_[0]) { 853 if (ref $_[0]) {
623 _object_attach @_; 854 _object_attach @_;
624 } else { 855 } else {
625 _attach shift->_attach_registry, @_; 856 _attach shift->_attach_registry, @_;
626 } 857 }
858 _recalc_want;
627}; 859};
628 860
629# all those should be optimised 861# all those should be optimised
630sub cf::attachable::detach { 862sub cf::attachable::detach {
631 my ($obj, $name) = @_; 863 my ($obj, $name) = @_;
634 delete $obj->{_attachment}{$name}; 866 delete $obj->{_attachment}{$name};
635 reattach ($obj); 867 reattach ($obj);
636 } else { 868 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 869 Carp::croak "cannot, currently, detach class attachments";
638 } 870 }
871 _recalc_want;
639}; 872};
640 873
641sub cf::attachable::attached { 874sub cf::attachable::attached {
642 my ($obj, $name) = @_; 875 my ($obj, $name) = @_;
643 876
658 "; 891 ";
659 die if $@; 892 die if $@;
660} 893}
661 894
662our $override; 895our $override;
663our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
664 897
665sub override { 898sub override {
666 $override = 1; 899 $override = 1;
667 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
668} 901}
669 902
670sub do_invoke { 903sub do_invoke {
671 my $event = shift; 904 my $event = shift;
672 my $callbacks = shift; 905 my $callbacks = shift;
673 906
674 @invoke_results = (); 907 @INVOKE_RESULTS = ();
675 908
676 local $override; 909 local $override;
677 910
678 for (@$callbacks) { 911 for (@$callbacks) {
679 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
696 929
697Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
698 931
699This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
700removed in future versions), and there is no public API to access override 933removed in future versions), and there is no public API to access override
701results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
702 935
703=back 936=back
704 937
705=cut 938=cut
706 939
707############################################################################# 940#############################################################################
708# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
709 953
710sub reattach { 954sub reattach {
711 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
712 my ($obj) = @_; 956 my ($obj) = @_;
713 957
816 or return; 1060 or return;
817 $av = eval { (Storable::thaw $av)->{objs} }; 1061 $av = eval { (Storable::thaw $av)->{objs} };
818 } 1062 }
819 1063
820 warn sprintf "loading %s (%d)\n", 1064 warn sprintf "loading %s (%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 1065 $filename, length $data, scalar @{$av || []};
822 return ($data, $av); 1066 return ($data, $av);
823} 1067}
1068
1069=head2 COMMAND CALLBACKS
1070
1071=over 4
1072
1073=cut
824 1074
825############################################################################# 1075#############################################################################
826# command handling &c 1076# command handling &c
827 1077
828=item cf::register_command $name => \&callback($ob,$args); 1078=item cf::register_command $name => \&callback($ob,$args);
841 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
842} 1092}
843 1093
844=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
845 1095
846Register a callbackf ro execution when the client sends an extcmd packet. 1096Register a callback for execution when the client sends an (synchronous)
1097extcmd packet. Ext commands will be processed in the order they are
1098received by the server, like other user commands. The first argument is
1099the logged-in player. Ext commands can only be processed after a player
1100has logged in successfully.
847 1101
848If the callback returns something, it is sent back as if reply was being 1102If the callback returns something, it is sent back as if reply was being
849called. 1103called.
850 1104
1105=item cf::register_exticmd $name => \&callback($ns,$packet);
1106
1107Register a callback for execution when the client sends an (asynchronous)
1108exticmd packet. Exti commands are processed by the server as soon as they
1109are received, i.e. out of order w.r.t. other commands. The first argument
1110is a client socket. Exti commands can be received anytime, even before
1111log-in.
1112
1113If the callback returns something, it is sent back as if reply was being
1114called.
1115
851=cut 1116=cut
852 1117
853sub register_extcmd { 1118sub register_extcmd {
854 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
855 1120
856 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
857} 1128}
858 1129
859cf::player->attach ( 1130cf::player->attach (
860 on_command => sub { 1131 on_command => sub {
861 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
870 cf::override; 1141 cf::override;
871 }, 1142 },
872 on_extcmd => sub { 1143 on_extcmd => sub {
873 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
874 1145
875 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
876 1147
877 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
878 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
879 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
880 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
881 } 1158 if $reply;
882 } 1159 }
883 } else { 1160 } else {
884 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
885 } 1162 }
886 1163
887 cf::override; 1164 cf::override;
888 }, 1165 },
889); 1166);
890 1167
891sub load_extension {
892 my ($path) = @_;
893
894 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
895 my $base = $1;
896 my $pkg = $1;
897 $pkg =~ s/[^[:word:]]/_/g;
898 $pkg = "ext::$pkg";
899
900 warn "... loading '$path' into '$pkg'\n";
901
902 open my $fh, "<:utf8", $path
903 or die "$path: $!";
904
905 my $source =
906 "package $pkg; use strict; use utf8;\n"
907 . "#line 1 \"$path\"\n{\n"
908 . (do { local $/; <$fh> })
909 . "\n};\n1";
910
911 unless (eval $source) {
912 my $msg = $@ ? "$path: $@\n"
913 : "extension disabled.\n";
914 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915 warn $@;
916 warn "mandatory extension failed to load, exiting.\n";
917 exit 1;
918 }
919 die $@;
920 }
921
922 push @EXTS, $pkg;
923}
924
925sub load_extensions { 1168sub load_extensions {
1169 cf::sync_job {
1170 my %todo;
1171
926 for my $ext (<$LIBDIR/*.ext>) { 1172 for my $path (<$LIBDIR/*.ext>) {
927 next unless -r $ext; 1173 next unless -r $path;
928 eval { 1174
929 load_extension $ext; 1175 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1176 my $base = $1;
1177 my $pkg = $1;
1178 $pkg =~ s/[^[:word:]]/_/g;
1179 $pkg = "ext::$pkg";
1180
1181 open my $fh, "<:utf8", $path
1182 or die "$path: $!";
1183
1184 my $source = do { local $/; <$fh> };
1185
1186 my %ext = (
1187 path => $path,
1188 base => $base,
1189 pkg => $pkg,
1190 );
1191
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194
1195 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n"
1197 . "#line 1 \"$path\"\n{\n"
1198 . $source
1199 . "\n};\n1";
1200
1201 $todo{$base} = \%ext;
1202 }
1203
1204 my %done;
1205 while (%todo) {
1206 my $progress;
1207
1208 while (my ($k, $v) = each %todo) {
1209 for (split /,\s*/, $v->{meta}{depends}) {
1210 goto skip
1211 unless exists $done{$_};
1212 }
1213
1214 warn "... loading '$k' into '$v->{pkg}'\n";
1215
1216 unless (eval $v->{source}) {
1217 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n";
1219
1220 if (exists $v->{meta}{mandatory}) {
1221 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n";
1223 exit 1;
1224 }
1225
1226 warn $msg;
1227 }
1228
1229 $done{$k} = delete $todo{$k};
1230 push @EXTS, $v->{pkg};
1231 $progress = 1;
930 1 1232 }
931 } or warn "$ext not loaded: $@"; 1233
1234 skip:
1235 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1236 unless $progress;
1237 }
932 } 1238 };
933} 1239}
934 1240
935############################################################################# 1241#############################################################################
936 1242
1243=back
1244
937=head2 CORE EXTENSIONS 1245=head2 CORE EXTENSIONS
938 1246
939Functions and methods that extend core crossfire objects. 1247Functions and methods that extend core crossfire objects.
940 1248
941=cut 1249=cut
953Returns the given player object, loading it if necessary (might block). 1261Returns the given player object, loading it if necessary (might block).
954 1262
955=cut 1263=cut
956 1264
957sub playerdir($) { 1265sub playerdir($) {
958 cf::localdir 1266 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1267 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1268}
964 1269
965sub path($) { 1270sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1271 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 1272
968 (playerdir $login) . "/$login.pl" 1273 (playerdir $login) . "/playerdata"
969} 1274}
970 1275
971sub find_active($) { 1276sub find_active($) {
972 $cf::PLAYER{$_[0]} 1277 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 1278 and $cf::PLAYER{$_[0]}->active
986 my $login = $_[0]; 1291 my $login = $_[0];
987 1292
988 my $guard = cf::lock_acquire "user_find:$login"; 1293 my $guard = cf::lock_acquire "user_find:$login";
989 1294
990 $cf::PLAYER{$_[0]} || do { 1295 $cf::PLAYER{$_[0]} || do {
1296 # rename old playerfiles to new ones
1297 #TODO: remove when no longer required
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl";
1302
991 my $pl = load_pl path $login 1303 my $pl = load_pl path $login
992 or return; 1304 or return;
993 $cf::PLAYER{$login} = $pl 1305 $cf::PLAYER{$login} = $pl
994 } 1306 }
995 } 1307 }
1021 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1022 1334
1023 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1024 1336
1025 $self 1337 $self
1338}
1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1026} 1348}
1027 1349
1028=item $pl->quit_character 1350=item $pl->quit_character
1029 1351
1030Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
1079while and may block, so not sync_job-capable, ever. 1401while and may block, so not sync_job-capable, ever.
1080 1402
1081=cut 1403=cut
1082 1404
1083sub list_logins { 1405sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1406 my $dirs = aio_readdir $PLAYERDIR
1085 or return []; 1407 or return [];
1086 1408
1087 my @logins; 1409 my @logins;
1088 1410
1089 for my $login (@$dirs) { 1411 for my $login (@$dirs) {
1124 } 1446 }
1125 1447
1126 \@paths 1448 \@paths
1127} 1449}
1128 1450
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1452
1453Expand crossfire pod fragments into protocol xml.
1454
1455=cut
1456
1457sub expand_cfpod {
1458 ((my $self), (local $_)) = @_;
1459
1460 # escape & and <
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463
1464 # this is buggy, it needs to properly take care of nested <'s
1465
1466 1 while
1467 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/
1471 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1
1474 }ge
1475 # replace H<hint text>
1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1483
1484 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494}
1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500
1129=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1130 1502
1131Sends an ext reply to the player. 1503Sends an ext reply to the player.
1132 1504
1133=cut 1505=cut
1134 1506
1135sub ext_reply($$%) { 1507sub ext_reply($$@) {
1136 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1137 1509
1138 $msg{msgid} = $id; 1510 $self->ns->ext_reply ($id, @msg)
1139
1140 $self->send ("ext " . cf::to_json \%msg);
1141} 1511}
1142 1512
1143=item $player->ext_event ($type, %msg) 1513=item $player->ext_msg ($type, @msg)
1144 1514
1145Sends an ext event to the client. 1515Sends an ext event to the client.
1146 1516
1147=cut 1517=cut
1148 1518
1149sub ext_event($$%) { 1519sub ext_msg($$@) {
1150 my ($self, $type, %msg) = @_; 1520 my ($self, $type, @msg) = @_;
1151 1521
1152 delete $msg{msgid}; 1522 $self->ns->ext_msg ($type, @msg);
1153 $msg{msgtype} = "event";
1154 $msg{eventtype} = $type;
1155
1156 $self->send ("ext " . cf::to_json \%msg);
1157} 1523}
1158 1524
1159package cf; 1525=head3 cf::region
1526
1527=over 4
1528
1529=cut
1530
1531package cf::region;
1532
1533=item cf::region::find_by_path $path
1534
1535Tries to decuce the likely region for a map knowing only its path.
1536
1537=cut
1538
1539sub find_by_path($) {
1540 my ($path) = @_;
1541
1542 my ($match, $specificity);
1543
1544 for my $region (list) {
1545 if ($region->{match} && $path =~ $region->{match}) {
1546 ($match, $specificity) = ($region, $region->specificity)
1547 if $region->specificity > $specificity;
1548 }
1549 }
1550
1551 $match
1552}
1160 1553
1161=back 1554=back
1162
1163 1555
1164=head3 cf::map 1556=head3 cf::map
1165 1557
1166=over 4 1558=over 4
1167 1559
1222 my ($self, $merge) = @_; 1614 my ($self, $merge) = @_;
1223 1615
1224 # we have to keep some variables in memory intact 1616 # we have to keep some variables in memory intact
1225 local $self->{path}; 1617 local $self->{path};
1226 local $self->{load_path}; 1618 local $self->{load_path};
1227 local $self->{deny_save};
1228 local $self->{deny_reset};
1229 1619
1230 $self->SUPER::thawer_merge ($merge); 1620 $self->SUPER::thawer_merge ($merge);
1231} 1621}
1232 1622
1233sub normalise { 1623sub normalise {
1280 $self->init; # pass $1 etc. 1670 $self->init; # pass $1 etc.
1281 return $self; 1671 return $self;
1282 } 1672 }
1283 } 1673 }
1284 1674
1285 Carp::carp "unable to resolve path '$path' (base '$base')."; 1675 Carp::cluck "unable to resolve path '$path' (base '$base').";
1286 () 1676 ()
1287} 1677}
1288 1678
1289sub init { 1679sub init {
1290 my ($self) = @_; 1680 my ($self) = @_;
1305 1695
1306# the original (read-only) location 1696# the original (read-only) location
1307sub load_path { 1697sub load_path {
1308 my ($self) = @_; 1698 my ($self) = @_;
1309 1699
1310 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1700 "$MAPDIR/$self->{path}.map"
1311} 1701}
1312 1702
1313# the temporary/swap location 1703# the temporary/swap location
1314sub save_path { 1704sub save_path {
1315 my ($self) = @_; 1705 my ($self) = @_;
1316 1706
1317 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1707 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1318 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1708 "$TMPDIR/$path.map"
1319} 1709}
1320 1710
1321# the unique path, undef == no special unique path 1711# the unique path, undef == no special unique path
1322sub uniq_path { 1712sub uniq_path {
1323 my ($self) = @_; 1713 my ($self) = @_;
1324 1714
1325 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1715 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1326 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1716 "$UNIQUEDIR/$path"
1327} 1717}
1328 1718
1329# and all this just because we cannot iterate over 1719# and all this just because we cannot iterate over
1330# all maps in C++... 1720# all maps in C++...
1331sub change_all_map_light { 1721sub change_all_map_light {
1332 my ($change) = @_; 1722 my ($change) = @_;
1333 1723
1334 $_->change_map_light ($change) 1724 $_->change_map_light ($change)
1335 for grep $_->outdoor, values %cf::MAP; 1725 for grep $_->outdoor, values %cf::MAP;
1726}
1727
1728sub decay_objects {
1729 my ($self) = @_;
1730
1731 return if $self->{deny_reset};
1732
1733 $self->do_decay_objects;
1336} 1734}
1337 1735
1338sub unlink_save { 1736sub unlink_save {
1339 my ($self) = @_; 1737 my ($self) = @_;
1340 1738
1398 $self->load_header_orig 1796 $self->load_header_orig
1399 or return; 1797 or return;
1400 $self->prepare_orig; 1798 $self->prepare_orig;
1401 } 1799 }
1402 1800
1801 $self->{deny_reset} = 1
1802 if $self->no_reset;
1803
1804 $self->default_region (cf::region::find_by_path $self->{path})
1805 unless $self->default_region;
1806
1403 1 1807 1
1404} 1808}
1405 1809
1406sub find; 1810sub find;
1407sub find { 1811sub find {
1419 $map->{last_save} = $cf::RUNTIME; 1823 $map->{last_save} = $cf::RUNTIME;
1420 1824
1421 $map->load_header 1825 $map->load_header
1422 or return; 1826 or return;
1423 1827
1424 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1425 # doing this can freeze the server in a sync job, obviously 1829 # doing this can freeze the server in a sync job, obviously
1426 #$cf::WAIT_FOR_TICK->wait; 1830 #$cf::WAIT_FOR_TICK->wait;
1427 $map->reset; 1831 $map->reset;
1428 undef $guard; 1832 undef $guard;
1429 return find $path; 1833 return find $path;
1440 my ($self) = @_; 1844 my ($self) = @_;
1441 1845
1442 local $self->{deny_reset} = 1; # loading can take a long time 1846 local $self->{deny_reset} = 1; # loading can take a long time
1443 1847
1444 my $path = $self->{path}; 1848 my $path = $self->{path};
1849
1850 {
1445 my $guard = cf::lock_acquire "map_load:$path"; 1851 my $guard = cf::lock_acquire "map_load:$path";
1446 1852
1447 return if $self->in_memory != cf::MAP_SWAPPED; 1853 return if $self->in_memory != cf::MAP_SWAPPED;
1448 1854
1449 $self->in_memory (cf::MAP_LOADING); 1855 $self->in_memory (cf::MAP_LOADING);
1450 1856
1451 $self->alloc; 1857 $self->alloc;
1452 1858
1453 $self->pre_load; 1859 $self->pre_load;
1454
1455 $self->_load_objects ($self->{load_path}, 1)
1456 or return;
1457
1458 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1459 if delete $self->{load_original};
1460
1461 if (my $uniq = $self->uniq_path) {
1462 utf8::encode $uniq;
1463 if (aio_open $uniq, O_RDONLY, 0) {
1464 $self->clear_unique_items;
1465 $self->_load_objects ($uniq, 0);
1466 }
1467 }
1468
1469 Coro::cede;
1470
1471 # now do the right thing for maps
1472 $self->link_multipart_objects;
1473
1474 unless ($self->{deny_activate}) {
1475 $self->decay_objects;
1476 $self->fix_auto_apply;
1477 $self->update_buttons;
1478 Coro::cede; 1860 Coro::cede;
1479 $self->set_darkness_map; 1861
1862 $self->_load_objects ($self->{load_path}, 1)
1863 or return;
1864
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original};
1867
1868 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) {
1871 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0);
1873 }
1874 }
1875
1876 Coro::cede;
1877 # now do the right thing for maps
1878 $self->link_multipart_objects;
1480 $self->difficulty ($self->estimate_difficulty) 1879 $self->difficulty ($self->estimate_difficulty)
1481 unless $self->difficulty; 1880 unless $self->difficulty;
1482 Coro::cede; 1881 Coro::cede;
1882
1883 unless ($self->{deny_activate}) {
1884 $self->decay_objects;
1885 $self->fix_auto_apply;
1886 $self->update_buttons;
1887 Coro::cede;
1888 $self->set_darkness_map;
1889 Coro::cede;
1483 $self->activate; 1890 $self->activate;
1891 }
1892
1893 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME);
1895
1896 $self->in_memory (cf::MAP_IN_MEMORY);
1484 } 1897 }
1485 1898
1486 $self->post_load; 1899 $self->post_load;
1487
1488 $self->in_memory (cf::MAP_IN_MEMORY);
1489} 1900}
1490 1901
1491sub customise_for { 1902sub customise_for {
1492 my ($self, $ob) = @_; 1903 my ($self, $ob) = @_;
1493 1904
1494 return find "~" . $ob->name . "/" . $self->{path} 1905 return find "~" . $ob->name . "/" . $self->{path}
1495 if $self->per_player; 1906 if $self->per_player;
1496 1907
1908# return find "?party/" . $ob->name . "/" . $self->{path}
1909# if $self->per_party;
1910
1497 $self 1911 $self
1498} 1912}
1499 1913
1500# find and load all maps in the 3x3 area around a map 1914# find and load all maps in the 3x3 area around a map
1501sub load_diag { 1915sub load_neighbours {
1502 my ($map) = @_; 1916 my ($map) = @_;
1503 1917
1504 my @diag; # diagonal neighbours 1918 my @neigh; # diagonal neighbours
1505 1919
1506 for (0 .. 3) { 1920 for (0 .. 3) {
1507 my $neigh = $map->tile_path ($_) 1921 my $neigh = $map->tile_path ($_)
1508 or next; 1922 or next;
1509 $neigh = find $neigh, $map 1923 $neigh = find $neigh, $map
1510 or next; 1924 or next;
1511 $neigh->load; 1925 $neigh->load;
1512 1926
1927 push @neigh,
1513 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1928 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1514 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1929 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1515 } 1930 }
1516 1931
1517 for (@diag) { 1932 for (grep defined $_->[0], @neigh) {
1933 my ($path, $origin) = @$_;
1518 my $neigh = find @$_ 1934 my $neigh = find $path, $origin
1519 or next; 1935 or next;
1520 $neigh->load; 1936 $neigh->load;
1521 } 1937 }
1522} 1938}
1523 1939
1547 1963
1548 undef $MAP_PREFETCH{$path}; 1964 undef $MAP_PREFETCH{$path};
1549 $MAP_PREFETCHER ||= cf::async { 1965 $MAP_PREFETCHER ||= cf::async {
1550 while (%MAP_PREFETCH) { 1966 while (%MAP_PREFETCH) {
1551 for my $path (keys %MAP_PREFETCH) { 1967 for my $path (keys %MAP_PREFETCH) {
1552 my $map = find $path 1968 if (my $map = find $path) {
1553 or next;
1554 $map->load; 1969 $map->load;
1970 }
1555 1971
1556 delete $MAP_PREFETCH{$path}; 1972 delete $MAP_PREFETCH{$path};
1557 } 1973 }
1558 } 1974 }
1559 undef $MAP_PREFETCHER; 1975 undef $MAP_PREFETCHER;
1611 2027
1612sub reset_at { 2028sub reset_at {
1613 my ($self) = @_; 2029 my ($self) = @_;
1614 2030
1615 # TODO: safety, remove and allow resettable per-player maps 2031 # TODO: safety, remove and allow resettable per-player maps
1616 return 1e99 if $self->isa ("ext::map_per_player");#d#
1617 return 1e99 if $self->{deny_reset}; 2032 return 1e99 if $self->{deny_reset};
1618 2033
1619 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2034 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1620 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2035 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1621 2036
1632 my ($self) = @_; 2047 my ($self) = @_;
1633 2048
1634 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2049 my $lock = cf::lock_acquire "map_data:$self->{path}";
1635 2050
1636 return if $self->players; 2051 return if $self->players;
1637 return if $self->isa ("ext::map_per_player");#d#
1638 2052
1639 warn "resetting map ", $self->path;#d# 2053 warn "resetting map ", $self->path;
1640 2054
1641 $self->in_memory (cf::MAP_SWAPPED); 2055 $self->in_memory (cf::MAP_SWAPPED);
1642 2056
1643 # need to save uniques path 2057 # need to save uniques path
1644 unless ($self->{deny_save}) { 2058 unless ($self->{deny_save}) {
1676 $cf::MAP{$self->path} = $self; 2090 $cf::MAP{$self->path} = $self;
1677 2091
1678 $self->reset; # polite request, might not happen 2092 $self->reset; # polite request, might not happen
1679} 2093}
1680 2094
2095=item $maps = cf::map::tmp_maps
2096
2097Returns an arrayref with all map paths of currently instantiated and saved
2098maps. May block.
2099
2100=cut
2101
2102sub tmp_maps() {
2103 [
2104 map {
2105 utf8::decode $_;
2106 /\.map$/
2107 ? normalise $_
2108 : ()
2109 } @{ aio_readdir $TMPDIR or [] }
2110 ]
2111}
2112
2113=item $maps = cf::map::random_maps
2114
2115Returns an arrayref with all map paths of currently instantiated and saved
2116random maps. May block.
2117
2118=cut
2119
2120sub random_maps() {
2121 [
2122 map {
2123 utf8::decode $_;
2124 /\.map$/
2125 ? normalise "?random/$_"
2126 : ()
2127 } @{ aio_readdir $RANDOMDIR or [] }
2128 ]
2129}
2130
1681=item cf::map::unique_maps 2131=item cf::map::unique_maps
1682 2132
1683Returns an arrayref of paths of all shared maps that have 2133Returns an arrayref of paths of all shared maps that have
1684instantiated unique items. May block. 2134instantiated unique items. May block.
1685 2135
1686=cut 2136=cut
1687 2137
1688sub unique_maps() { 2138sub unique_maps() {
1689 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2139 [
1690 or return; 2140 map {
1691
1692 my @paths;
1693
1694 for (@$files) {
1695 utf8::decode $_; 2141 utf8::decode $_;
1696 next if /\.pst$/; 2142 /\.map$/
1697 next unless /^$PATH_SEP/o; 2143 ? normalise $_
1698 2144 : ()
1699 push @paths, cf::map::normalise $_; 2145 } @{ aio_readdir $UNIQUEDIR or [] }
1700 } 2146 ]
1701
1702 \@paths
1703} 2147}
1704 2148
1705package cf; 2149package cf;
1706 2150
1707=back 2151=back
1753 2197
1754 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2198 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1755 2199
1756 if ($self->{record_replies}) { 2200 if ($self->{record_replies}) {
1757 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2201 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2202
1758 } else { 2203 } else {
2204 my $pl = $self->contr;
2205
2206 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2207 my $dialog = $pl->{npc_dialog};
2208 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2209
2210 } else {
1759 $msg = $npc->name . " says: $msg" if $npc; 2211 $msg = $npc->name . " says: $msg" if $npc;
1760 $self->message ($msg, $flags); 2212 $self->message ($msg, $flags);
2213 }
1761 } 2214 }
2215}
2216
2217=item $object->send_msg ($channel, $msg, $color, [extra...])
2218
2219=cut
2220
2221sub cf::object::send_msg {
2222 my $pl = shift->contr
2223 or return;
2224 $pl->send_msg (@_);
1762} 2225}
1763 2226
1764=item $player_object->may ("access") 2227=item $player_object->may ("access")
1765 2228
1766Returns wether the given player is authorized to access resource "access" 2229Returns wether the given player is authorized to access resource "access"
1813 $self->deactivate_recursive; 2276 $self->deactivate_recursive;
1814 2277
1815 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2278 return if UNIVERSAL::isa $self->map, "ext::map_link";
1816 2279
1817 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2280 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1818 if $self->map; 2281 if $self->map && $self->map->{path} ne "{link}";
1819 2282
1820 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2283 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1821} 2284}
1822 2285
1823sub cf::object::player::leave_link { 2286sub cf::object::player::leave_link {
1824 my ($self, $map, $x, $y) = @_; 2287 my ($self, $map, $x, $y) = @_;
2288
2289 return unless $self->contr->active;
1825 2290
1826 my $link_pos = delete $self->{_link_pos}; 2291 my $link_pos = delete $self->{_link_pos};
1827 2292
1828 unless ($map) { 2293 unless ($map) {
1829 # restore original map position 2294 # restore original map position
1843 # use -1 or undef as default coordinates, not 0, 0 2308 # use -1 or undef as default coordinates, not 0, 0
1844 ($x, $y) = ($map->enter_x, $map->enter_y) 2309 ($x, $y) = ($map->enter_x, $map->enter_y)
1845 if $x <=0 && $y <= 0; 2310 if $x <=0 && $y <= 0;
1846 2311
1847 $map->load; 2312 $map->load;
1848 $map->load_diag; 2313 $map->load_neighbours;
1849 2314
1850 return unless $self->contr->active; 2315 return unless $self->contr->active;
1851 $self->activate_recursive; 2316 $self->activate_recursive;
1852 2317
1853 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2318 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1854 $self->enter_map ($map, $x, $y); 2319 $self->enter_map ($map, $x, $y);
1855} 2320}
1856 2321
1857cf::player->attach ( 2322=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1858 on_logout => sub {
1859 my ($pl) = @_;
1860 2323
1861 # abort map switching before logout 2324Moves the player to the given map-path and coordinates by first freezing
1862 if ($pl->ob->{_link_pos}) { 2325her, loading and preparing them map, calling the provided $check callback
1863 cf::sync_job { 2326that has to return the map if sucecssful, and then unfreezes the player on
1864 $pl->ob->leave_link 2327the new (success) or old (failed) map position. In either case, $done will
1865 }; 2328be called at the end of this process.
1866 }
1867 },
1868 on_login => sub {
1869 my ($pl) = @_;
1870 2329
1871 # try to abort aborted map switching on player login :)
1872 # should happen only on crashes
1873 if ($pl->ob->{_link_pos}) {
1874 $pl->ob->enter_link;
1875 (async {
1876 $pl->ob->reply (undef,
1877 "There was an internal problem at your last logout, "
1878 . "the server will try to bring you to your intended destination in a second.",
1879 cf::NDI_RED);
1880 # we need this sleep as the login has a concurrent enter_exit running
1881 # and this sleep increases chances of the player not ending up in scorn
1882 Coro::Timer::sleep 1;
1883 $pl->ob->leave_link;
1884 })->prio (2);
1885 }
1886 },
1887);
1888
1889=item $player_object->goto ($path, $x, $y)
1890
1891=cut 2330=cut
2331
2332our $GOTOGEN;
1892 2333
1893sub cf::object::player::goto { 2334sub cf::object::player::goto {
1894 my ($self, $path, $x, $y) = @_; 2335 my ($self, $path, $x, $y, $check, $done) = @_;
2336
2337 # do generation counting so two concurrent goto's will be executed in-order
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1895 2339
1896 $self->enter_link; 2340 $self->enter_link;
1897 2341
1898 (async { 2342 (async {
1899 my $map = eval { 2343 my $map = eval {
1900 my $map = cf::map::find $path; 2344 my $map = cf::map::find $path;
2345
2346 if ($map) {
1901 $map = $map->customise_for ($self) if $map; 2347 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map;
2349 } else {
2350 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2351 }
2352
1902 $map 2353 $map
2354 };
2355
2356 if ($@) {
2357 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2358 LOG llevError | logBacktrace, Carp::longmess $@;
1903 } or 2359 }
1904 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1905 2360
2361 if ($gen == $self->{_goto_generation}) {
2362 delete $self->{_goto_generation};
1906 $self->leave_link ($map, $x, $y); 2363 $self->leave_link ($map, $x, $y);
2364 }
2365
2366 $done->() if $done;
1907 })->prio (1); 2367 })->prio (1);
1908} 2368}
1909 2369
1910=item $player_object->enter_exit ($exit_object) 2370=item $player_object->enter_exit ($exit_object)
1911 2371
1950 2410
1951 $rmp->{random_seed} ||= $exit->random_seed; 2411 $rmp->{random_seed} ||= $exit->random_seed;
1952 2412
1953 my $data = cf::to_json $rmp; 2413 my $data = cf::to_json $rmp;
1954 my $md5 = Digest::MD5::md5_hex $data; 2414 my $md5 = Digest::MD5::md5_hex $data;
1955 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2415 my $meta = "$RANDOMDIR/$md5.meta";
1956 2416
1957 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2417 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1958 aio_write $fh, 0, (length $data), $data, 0; 2418 aio_write $fh, 0, (length $data), $data, 0;
1959 undef $fh; 2419 undef $fh;
1960 aio_rename "$meta~", $meta; 2420 aio_rename "$meta~", $meta;
1969 2429
1970 return unless $self->type == cf::PLAYER; 2430 return unless $self->type == cf::PLAYER;
1971 2431
1972 if ($exit->slaying eq "/!") { 2432 if ($exit->slaying eq "/!") {
1973 #TODO: this should de-fi-ni-te-ly not be a sync-job 2433 #TODO: this should de-fi-ni-te-ly not be a sync-job
2434 # the problem is that $exit might not survive long enough
2435 # so it needs to be done right now, right here
1974 cf::sync_job { prepare_random_map $exit }; 2436 cf::sync_job { prepare_random_map $exit };
1975 } 2437 }
1976 2438
1977 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2439 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1978 my $hp = $exit->stats->hp; 2440 my $hp = $exit->stats->hp;
1979 my $sp = $exit->stats->sp; 2441 my $sp = $exit->stats->sp;
1980 2442
1981 $self->enter_link; 2443 $self->enter_link;
2444
2445 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED);
1982 2448
1983 (async { 2449 (async {
1984 $self->deactivate_recursive; # just to be sure 2450 $self->deactivate_recursive; # just to be sure
1985 unless (eval { 2451 unless (eval {
1986 $self->goto ($slaying, $hp, $sp); 2452 $self->goto ($slaying, $hp, $sp);
1987 2453
1988 1; 2454 1;
1989 }) { 2455 }) {
1990 $self->message ("Something went wrong deep within the crossfire server. " 2456 $self->message ("Something went wrong deep within the crossfire server. "
1991 . "I'll try to bring you back to the map you were before. " 2457 . "I'll try to bring you back to the map you were before. "
1992 . "Please report this to the dungeon master!", 2458 . "Please report this to the dungeon master!",
1993 cf::NDI_UNIQUE | cf::NDI_RED); 2459 cf::NDI_UNIQUE | cf::NDI_RED);
1994 2460
1995 warn "ERROR in enter_exit: $@"; 2461 warn "ERROR in enter_exit: $@";
1996 $self->leave_link; 2462 $self->leave_link;
1997 } 2463 }
1998 })->prio (1); 2464 })->prio (1);
2014 2480
2015 utf8::encode $text; 2481 utf8::encode $text;
2016 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2482 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2017} 2483}
2018 2484
2485=item $client->send_msg ($channel, $msg, $color, [extra...])
2486
2487Send a drawinfo or msg packet to the client, formatting the msg for the
2488client if neccessary. C<$type> should be a string identifying the type of
2489the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet.
2491
2492=cut
2493
2494sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_;
2496
2497 $msg = $self->pl->expand_cfpod ($msg);
2498
2499 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500
2501 if (ref $channel) {
2502 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel);
2506 }
2507
2508 $channel = $channel->{id};
2509 }
2510
2511 return unless @extra || length $msg;
2512
2513 if ($self->can_msg) {
2514 # default colour, mask it out
2515 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2516 if $color & cf::NDI_DEF;
2517
2518 $self->send_packet ("msg " . $self->{json_coder}->encode (
2519 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2520 } else {
2521 if ($color >= 0) {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 $color &= cf::NDI_COLOR_MASK;
2533
2534 utf8::encode $msg;
2535
2536 if (0 && $msg =~ /\[/) {
2537 # COMMAND/INFO
2538 $self->send_packet ("drawextinfo $color 10 8 $msg")
2539 } else {
2540 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2541 $self->send_packet ("drawinfo $color $msg")
2542 }
2543 }
2544 }
2545}
2546
2547=item $client->ext_msg ($type, @msg)
2548
2549Sends an ext event to the client.
2550
2551=cut
2552
2553sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_;
2555
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 }
2564}
2565
2566=item $client->ext_reply ($msgid, @msg)
2567
2568Sends an ext reply to the client.
2569
2570=cut
2571
2572sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_;
2574
2575 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) {
2578 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 }
2582}
2019 2583
2020=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
2021 2585
2022Queues a query to the client, calling the given callback with 2586Queues a query to the client, calling the given callback with
2023the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2587the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2024C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2588C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2025 2589
2026Queries can fail, so check the return code. Or don't, as queries will become 2590Queries can fail, so check the return code. Or don't, as queries will
2027reliable at some point in the future. 2591become reliable at some point in the future.
2028 2592
2029=cut 2593=cut
2030 2594
2031sub cf::client::query { 2595sub cf::client::query {
2032 my ($self, $flags, $text, $cb) = @_; 2596 my ($self, $flags, $text, $cb) = @_;
2040 utf8::encode $text; 2604 utf8::encode $text;
2041 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2605 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2042 2606
2043 $self->send_packet ($self->{query_queue}[0][0]) 2607 $self->send_packet ($self->{query_queue}[0][0])
2044 if @{ $self->{query_queue} } == 1; 2608 if @{ $self->{query_queue} } == 1;
2609
2610 1
2045} 2611}
2046 2612
2047cf::client->attach ( 2613cf::client->attach (
2614 on_connect => sub {
2615 my ($ns) = @_;
2616
2617 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2618 },
2048 on_reply => sub { 2619 on_reply => sub {
2049 my ($ns, $msg) = @_; 2620 my ($ns, $msg) = @_;
2050 2621
2051 # this weird shuffling is so that direct followup queries 2622 # this weird shuffling is so that direct followup queries
2052 # get handled first 2623 # get handled first
2064 } else { 2635 } else {
2065 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2636 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2066 } 2637 }
2067 } 2638 }
2068 }, 2639 },
2640 on_exticmd => sub {
2641 my ($ns, $buf) = @_;
2642
2643 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2644
2645 if (ref $msg) {
2646 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg
2648 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650
2651 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 }
2657 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 }
2660
2661 cf::override;
2662 },
2069); 2663);
2070 2664
2071=item $client->async (\&cb) 2665=item $client->async (\&cb)
2072 2666
2073Create a new coroutine, running the specified callback. The coroutine will 2667Create a new coroutine, running the specified callback. The coroutine will
2114our $safe = new Safe "safe"; 2708our $safe = new Safe "safe";
2115our $safe_hole = new Safe::Hole; 2709our $safe_hole = new Safe::Hole;
2116 2710
2117$SIG{FPE} = 'IGNORE'; 2711$SIG{FPE} = 'IGNORE';
2118 2712
2119$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2713$safe->permit_only (Opcode::opset qw(
2714 :base_core :base_mem :base_orig :base_math
2715 grepstart grepwhile mapstart mapwhile
2716 sort time
2717));
2120 2718
2121# here we export the classes and methods available to script code 2719# here we export the classes and methods available to script code
2122 2720
2123=pod 2721=pod
2124 2722
2125The following functions and methods are available within a safe environment: 2723The following functions and methods are available within a safe environment:
2126 2724
2127 cf::object contr pay_amount pay_player map 2725 cf::object
2726 contr pay_amount pay_player map x y force_find force_add
2727 insert remove name archname title slaying race
2728
2128 cf::object::player player 2729 cf::object::player
2129 cf::player peaceful 2730 player
2130 cf::map trigger 2731
2732 cf::player
2733 peaceful
2734
2735 cf::map
2736 trigger
2131 2737
2132=cut 2738=cut
2133 2739
2134for ( 2740for (
2135 ["cf::object" => qw(contr pay_amount pay_player map)], 2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)],
2136 ["cf::object::player" => qw(player)], 2743 ["cf::object::player" => qw(player)],
2137 ["cf::player" => qw(peaceful)], 2744 ["cf::player" => qw(peaceful)],
2138 ["cf::map" => qw(trigger)], 2745 ["cf::map" => qw(trigger)],
2139) { 2746) {
2140 no strict 'refs'; 2747 no strict 'refs';
2211=back 2818=back
2212 2819
2213=cut 2820=cut
2214 2821
2215############################################################################# 2822#############################################################################
2216
2217=head2 EXTENSION DATABASE SUPPORT
2218
2219Crossfire maintains a very simple database for extension use. It can
2220currently store anything that can be serialised using Storable, which
2221excludes objects.
2222
2223The parameter C<$family> should best start with the name of the extension
2224using it, it should be unique.
2225
2226=over 4
2227
2228=item $value = cf::db_get $family => $key
2229
2230Returns a single value from the database.
2231
2232=item cf::db_put $family => $key => $value
2233
2234Stores the given C<$value> in the family.
2235
2236=cut
2237
2238our $DB;
2239
2240sub db_init {
2241 unless ($DB) {
2242 $DB = BDB::db_create $DB_ENV;
2243
2244 cf::sync_job {
2245 eval {
2246 $DB->set_flags (BDB::CHKSUM);
2247
2248 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2249 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2250 cf::cleanup "db_open(db): $!" if $!;
2251 };
2252 cf::cleanup "db_open(db): $@" if $@;
2253 };
2254
2255 my $path = cf::localdir . "/database.pst";
2256 if (stat $path) {
2257 cf::sync_job {
2258 my $pst = Storable::retrieve $path;
2259
2260 cf::db_put (board => data => $pst->{board});
2261 cf::db_put (guildrules => data => $pst->{guildrules});
2262 cf::db_put (rent => balance => $pst->{rent}{balance});
2263 BDB::db_env_txn_checkpoint $DB_ENV;
2264
2265 unlink $path;
2266 };
2267 }
2268 }
2269}
2270
2271sub db_get($$) {
2272 my $key = "$_[0]/$_[1]";
2273
2274 cf::sync_job {
2275 BDB::db_get $DB, undef, $key, my $data;
2276
2277 $! ? ()
2278 : Compress::LZF::sthaw $data
2279 }
2280}
2281
2282sub db_put($$$) {
2283 BDB::dbreq_pri 4;
2284 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2285}
2286
2287#############################################################################
2288# the server's init and main functions 2823# the server's init and main functions
2289 2824
2290sub load_facedata { 2825sub load_facedata($) {
2291 my $path = sprintf "%s/facedata", cf::datadir; 2826 my ($path) = @_;
2827
2828 my $enc = JSON::XS->new->utf8->canonical;
2292 2829
2293 warn "loading facedata from $path\n"; 2830 warn "loading facedata from $path\n";
2294 2831
2295 my $faces; 2832 my $facedata;
2296 0 < aio_load $path, $faces 2833 0 < aio_load $path, $facedata
2297 or die "$path: $!"; 2834 or die "$path: $!";
2298 2835
2299 Coro::cede;
2300 $faces = Storable::thaw $faces; 2836 $facedata = Coro::Storable::thaw $facedata;
2301 Coro::cede;
2302 2837
2303 my $meta = delete $faces->{""};
2304 $meta->{version} == 1 2838 $facedata->{version} == 2
2305 or cf::cleanup "$path: version mismatch, cannot proceed."; 2839 or cf::cleanup "$path: version mismatch, cannot proceed.";
2306 2840
2841 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845 };
2846 cf::cede_to_tick;
2847
2848 {
2849 my $faces = $facedata->{faceinfo};
2850
2307 while (my ($face, $info) = each %$faces) { 2851 while (my ($face, $info) = each %$faces) {
2308 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2852 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2309 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2853 cf::face::set_visibility $idx, $info->{visibility};
2854 cf::face::set_magicmap $idx, $info->{magicmap};
2310 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2311 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2312 Coro::cede;
2313 }
2314 2857
2858 cf::cede_to_tick;
2859 }
2860
2315 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2316 next unless $info->{smooth}; 2862 next unless $info->{smooth};
2317 my $idx = cf::face::find $face 2863 my $idx = cf::face::find $face
2318 or next; 2864 or next;
2319 if (my $smooth = cf::face::find $info->{smooth}) { 2865 if (my $smooth = cf::face::find $info->{smooth}) {
2320 cf::face::set_smooth $idx, $smooth; 2866 cf::face::set_smooth $idx, $smooth;
2867 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2321 } else { 2868 } else {
2322 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2869 warn "smooth face '$info->{smooth}' not found for face '$face'";
2323 } 2870 }
2324 Coro::cede; 2871
2872 cf::cede_to_tick;
2873 }
2874 }
2875
2876 {
2877 my $anims = $facedata->{animinfo};
2878
2879 while (my ($anim, $info) = each %$anims) {
2880 cf::anim::set $anim, $info->{frames}, $info->{facings};
2881 cf::cede_to_tick;
2882 }
2883
2884 cf::anim::invalidate_all; # d'oh
2885 }
2886
2887 {
2888 # TODO: for gcfclient pleasure, we should give resources
2889 # that gcfclient doesn't grok a >10000 face index.
2890 my $res = $facedata->{resource};
2891
2892 my $soundconf = delete $res->{"res/sound.conf"};
2893
2894 while (my ($name, $info) = each %$res) {
2895 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data;
2897
2898 if ($info->{type} & 1) {
2899 # prepend meta info
2900
2901 my $meta = $enc->encode ({
2902 name => $name,
2903 %{ $info->{meta} || {} },
2904 });
2905
2906 $data = pack "(w/a*)*", $meta, $info->{data};
2907 } else {
2908 $data = $info->{data};
2909 }
2910
2911 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2912 cf::face::set_type $idx, $info->{type};
2913
2914 cf::cede_to_tick;
2915 }
2916
2917 if ($soundconf) {
2918 $soundconf = $enc->decode (delete $soundconf->{data});
2919
2920 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2921 my $sound = $soundconf->{compat}[$_]
2922 or next;
2923
2924 my $face = cf::face::find "sound/$sound->[1]";
2925 cf::sound::set $sound->[0] => $face;
2926 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2927 }
2928
2929 while (my ($k, $v) = each %{$soundconf->{event}}) {
2930 my $face = cf::face::find "sound/$v";
2931 cf::sound::set $k => $face;
2932 }
2933 }
2325 } 2934 }
2326 2935
2327 1 2936 1
2328} 2937}
2329 2938
2939register_exticmd fx_want => sub {
2940 my ($ns, $want) = @_;
2941
2942 while (my ($k, $v) = each %$want) {
2943 $ns->fx_want ($k, $v);
2944 }
2945};
2946
2947sub reload_regions {
2948 load_resource_file "$MAPDIR/regions"
2949 or die "unable to load regions file\n";
2950
2951 for (cf::region::list) {
2952 $_->{match} = qr/$_->{match}/
2953 if exists $_->{match};
2954 }
2955}
2956
2957sub reload_facedata {
2958 load_facedata "$DATADIR/facedata"
2959 or die "unable to load facedata\n";
2960}
2961
2962sub reload_archetypes {
2963 load_resource_file "$DATADIR/archetypes"
2964 or die "unable to load archetypes\n";
2965 #d# NEED to laod twice to resolve forward references
2966 # this really needs to be done in an extra post-pass
2967 # (which needs to be synchronous, so solve it differently)
2968 load_resource_file "$DATADIR/archetypes"
2969 or die "unable to load archetypes\n";
2970}
2971
2972sub reload_treasures {
2973 load_resource_file "$DATADIR/treasures"
2974 or die "unable to load treasurelists\n";
2975}
2976
2330sub reload_resources { 2977sub reload_resources {
2331 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2978 warn "reloading resource files...\n";
2332 or die "unable to load regions file\n";#d# 2979
2980 reload_regions;
2333 load_facedata 2981 reload_facedata;
2334 or die "unable to load facedata\n";#d# 2982 #reload_archetypes;#d#
2983 reload_archetypes;
2984 reload_treasures;
2985
2986 warn "finished reloading resource files\n";
2335} 2987}
2336 2988
2337sub init { 2989sub init {
2338 reload_resources; 2990 reload_resources;
2339} 2991}
2340 2992
2341sub cfg_load { 2993sub cfg_load {
2342 open my $fh, "<:utf8", cf::confdir . "/config" 2994 open my $fh, "<:utf8", "$CONFDIR/config"
2343 or return; 2995 or return;
2344 2996
2345 local $/; 2997 local $/;
2346 *CFG = YAML::Syck::Load <$fh>; 2998 *CFG = YAML::Syck::Load <$fh>;
2347 2999
2392 }, 3044 },
2393 ); 3045 );
2394 } 3046 }
2395} 3047}
2396 3048
3049sub write_runtime {
3050 my $runtime = "$LOCALDIR/runtime";
3051
3052 # first touch the runtime file to show we are still running:
3053 # the fsync below can take a very very long time.
3054
3055 IO::AIO::aio_utime $runtime, undef, undef;
3056
3057 my $guard = cf::lock_acquire "write_runtime";
3058
3059 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3060 or return;
3061
3062 my $value = $cf::RUNTIME + 90 + 10;
3063 # 10 is the runtime save interval, for a monotonic clock
3064 # 60 allows for the watchdog to kill the server.
3065
3066 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3067 and return;
3068
3069 # always fsync - this file is important
3070 aio_fsync $fh
3071 and return;
3072
3073 # touch it again to show we are up-to-date
3074 aio_utime $fh, undef, undef;
3075
3076 close $fh
3077 or return;
3078
3079 aio_rename "$runtime~", $runtime
3080 and return;
3081
3082 warn "runtime file written.\n";
3083
3084 1
3085}
3086
2397sub emergency_save() { 3087sub emergency_save() {
2398 my $freeze_guard = cf::freeze_mainloop; 3088 my $freeze_guard = cf::freeze_mainloop;
2399 3089
2400 warn "enter emergency perl save\n"; 3090 warn "enter emergency perl save\n";
2401 3091
2432 3122
2433 warn Carp::longmess "post_cleanup backtrace" 3123 warn Carp::longmess "post_cleanup backtrace"
2434 if $make_core; 3124 if $make_core;
2435} 3125}
2436 3126
2437sub reload() { 3127sub do_reload_perl() {
2438 # can/must only be called in main 3128 # can/must only be called in main
2439 if ($Coro::current != $Coro::main) { 3129 if ($Coro::current != $Coro::main) {
2440 warn "can only reload from main coroutine"; 3130 warn "can only reload from main coroutine";
2441 return; 3131 return;
2442 } 3132 }
2476 %EXT_CORO = (); 3166 %EXT_CORO = ();
2477 3167
2478 warn "removing commands"; 3168 warn "removing commands";
2479 %COMMAND = (); 3169 %COMMAND = ();
2480 3170
2481 warn "removing ext commands"; 3171 warn "removing ext/exti commands";
2482 %EXTCMD = (); 3172 %EXTCMD = ();
3173 %EXTICMD = ();
2483 3174
2484 warn "unloading/nuking all extensions"; 3175 warn "unloading/nuking all extensions";
2485 for my $pkg (@EXTS) { 3176 for my $pkg (@EXTS) {
2486 warn "... unloading $pkg"; 3177 warn "... unloading $pkg";
2487 3178
2517 Symbol::delete_package "safe::$_" 3208 Symbol::delete_package "safe::$_"
2518 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3209 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2519 3210
2520 warn "unloading cf.pm \"a bit\""; 3211 warn "unloading cf.pm \"a bit\"";
2521 delete $INC{"cf.pm"}; 3212 delete $INC{"cf.pm"};
3213 delete $INC{"cf/pod.pm"};
2522 3214
2523 # don't, removes xs symbols, too, 3215 # don't, removes xs symbols, too,
2524 # and global variables created in xs 3216 # and global variables created in xs
2525 #Symbol::delete_package __PACKAGE__; 3217 #Symbol::delete_package __PACKAGE__;
2526 3218
2541 warn "reattaching attachments to maps"; 3233 warn "reattaching attachments to maps";
2542 reattach $_ for values %MAP; 3234 reattach $_ for values %MAP;
2543 warn "reattaching attachments to players"; 3235 warn "reattaching attachments to players";
2544 reattach $_ for values %PLAYER; 3236 reattach $_ for values %PLAYER;
2545 3237
2546 warn "loading reloadable resources";
2547 reload_resources;
2548
2549 warn "leaving sync_job"; 3238 warn "leaving sync_job";
2550 3239
2551 1 3240 1
2552 } or do { 3241 } or do {
2553 warn $@; 3242 warn $@;
2558 warn "reloaded"; 3247 warn "reloaded";
2559}; 3248};
2560 3249
2561our $RELOAD_WATCHER; # used only during reload 3250our $RELOAD_WATCHER; # used only during reload
2562 3251
3252sub reload_perl() {
3253 # doing reload synchronously and two reloads happen back-to-back,
3254 # coro crashes during coro_state_free->destroy here.
3255
3256 $RELOAD_WATCHER ||= Event->timer (
3257 reentrant => 0,
3258 after => 0,
3259 data => WF_AUTOCANCEL,
3260 cb => sub {
3261 do_reload_perl;
3262 undef $RELOAD_WATCHER;
3263 },
3264 );
3265}
3266
2563register_command "reload" => sub { 3267register_command "reload" => sub {
2564 my ($who, $arg) = @_; 3268 my ($who, $arg) = @_;
2565 3269
2566 if ($who->flag (FLAG_WIZ)) { 3270 if ($who->flag (FLAG_WIZ)) {
2567 $who->message ("reloading server."); 3271 $who->message ("reloading server.");
2568 3272 async { reload_perl };
2569 # doing reload synchronously and two reloads happen back-to-back,
2570 # coro crashes during coro_state_free->destroy here.
2571
2572 $RELOAD_WATCHER ||= Event->timer (
2573 reentrant => 0,
2574 after => 0,
2575 data => WF_AUTOCANCEL,
2576 cb => sub {
2577 reload;
2578 undef $RELOAD_WATCHER;
2579 },
2580 );
2581 } 3273 }
2582}; 3274};
2583 3275
2584unshift @INC, $LIBDIR; 3276unshift @INC, $LIBDIR;
2585 3277
2586my $bug_warning = 0; 3278my $bug_warning = 0;
2587 3279
3280our @WAIT_FOR_TICK;
3281our @WAIT_FOR_TICK_BEGIN;
3282
3283sub wait_for_tick {
3284 return unless $TICK_WATCHER->is_active;
3285 return if $Coro::current == $Coro::main;
3286
3287 my $signal = new Coro::Signal;
3288 push @WAIT_FOR_TICK, $signal;
3289 $signal->wait;
3290}
3291
3292sub wait_for_tick_begin {
3293 return unless $TICK_WATCHER->is_active;
3294 return if $Coro::current == $Coro::main;
3295
3296 my $signal = new Coro::Signal;
3297 push @WAIT_FOR_TICK_BEGIN, $signal;
3298 $signal->wait;
3299}
3300
3301 my $min = 1e6;#d#
3302 my $avg = 10;
2588$TICK_WATCHER = Event->timer ( 3303$TICK_WATCHER = Event->timer (
2589 reentrant => 0, 3304 reentrant => 0,
2590 parked => 1, 3305 parked => 1,
2591 prio => 0, 3306 prio => 0,
2592 at => $NEXT_TICK || $TICK, 3307 at => $NEXT_TICK || $TICK,
2596 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3311 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2597 unless ++$bug_warning > 10; 3312 unless ++$bug_warning > 10;
2598 return; 3313 return;
2599 } 3314 }
2600 3315
2601 $NOW = Event::time; 3316 $NOW = $tick_start = Event::time;
2602 3317
2603 cf::server_tick; # one server iteration 3318 cf::server_tick; # one server iteration
3319
3320 0 && sync_job {#d#
3321 for(1..10) {
3322 my $t = Event::time;
3323 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3324 or die;
3325
3326 $map->width (50);
3327 $map->height (50);
3328 $map->alloc;
3329 $map->_load_objects ("/tmp/x.map", 1);
3330 my $t = Event::time - $t;
3331
3332 #next unless $t < 0.0013;#d#
3333 if ($t < $min) {
3334 $min = $t;
3335 }
3336 $avg = $avg * 0.99 + $t * 0.01;
3337 }
3338 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3339 exit 0;
3340 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3341 };
3342
2604 $RUNTIME += $TICK; 3343 $RUNTIME += $TICK;
2605 $NEXT_TICK += $TICK; 3344 $NEXT_TICK += $TICK;
2606 3345
2607 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3346 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2608 $NEXT_RUNTIME_WRITE = $NOW + 10; 3347 $NEXT_RUNTIME_WRITE = $NOW + 10;
2610 write_runtime 3349 write_runtime
2611 or warn "ERROR: unable to write runtime file: $!"; 3350 or warn "ERROR: unable to write runtime file: $!";
2612 }; 3351 };
2613 } 3352 }
2614 3353
2615 $WAIT_FOR_TICK->broadcast;
2616 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2617
2618# my $AFTER = Event::time; 3354# my $AFTER = Event::time;
2619# warn $AFTER - $NOW;#d# 3355# warn $AFTER - $NOW;#d#
2620 3356
3357 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3358 $sig->send;
3359 }
3360 while (my $sig = shift @WAIT_FOR_TICK) {
3361 $sig->send;
3362 }
3363
3364 $NOW = Event::time;
3365
2621 # if we are delayed by four ticks or more, skip them all 3366 # if we are delayed by four ticks or more, skip them all
2622 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3367 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2623 3368
2624 $TICK_WATCHER->at ($NEXT_TICK); 3369 $TICK_WATCHER->at ($NEXT_TICK);
2625 $TICK_WATCHER->start; 3370 $TICK_WATCHER->start;
3371
3372 $LOAD = ($NOW - $tick_start) / $TICK;
3373 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3374
3375 _post_tick;
3376
3377
2626 }, 3378 },
2627); 3379);
2628 3380
2629{ 3381{
2630 BDB::max_poll_time $TICK * 0.1; 3382 BDB::max_poll_time $TICK * 0.1;
2658 3410
2659 cf::sync_job { 3411 cf::sync_job {
2660 eval { 3412 eval {
2661 BDB::db_env_open 3413 BDB::db_env_open
2662 $DB_ENV, 3414 $DB_ENV,
2663 $BDB_ENV_DIR, 3415 $BDBDIR,
2664 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3416 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2665 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3417 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2666 0666; 3418 0666;
2667 3419
2668 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3420 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2669 3421
2670 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3422 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2671 $DB_ENV->set_lk_detect; 3423 $DB_ENV->set_lk_detect;
2672 }; 3424 };
2673 3425
2689 prio => 6, 3441 prio => 6,
2690 cb => \&IO::AIO::poll_cb, 3442 cb => \&IO::AIO::poll_cb,
2691 ); 3443 );
2692} 3444}
2693 3445
3446my $_log_backtrace;
3447
3448sub _log_backtrace {
3449 my ($msg, @addr) = @_;
3450
3451 $msg =~ s/\n//;
3452
3453 # limit the # of concurrent backtraces
3454 if ($_log_backtrace < 2) {
3455 ++$_log_backtrace;
3456 async {
3457 my @bt = fork_call {
3458 @addr = map { sprintf "%x", $_ } @addr;
3459 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3460 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3461 or die "addr2line: $!";
3462
3463 my @funcs;
3464 my @res = <$fh>;
3465 chomp for @res;
3466 while (@res) {
3467 my ($func, $line) = splice @res, 0, 2, ();
3468 push @funcs, "[$func] $line";
3469 }
3470
3471 @funcs
3472 };
3473
3474 LOG llevInfo, "[ABT] $msg\n";
3475 LOG llevInfo, "[ABT] $_\n" for @bt;
3476 --$_log_backtrace;
3477 };
3478 } else {
3479 LOG llevInfo, "[ABT] $msg\n";
3480 LOG llevInfo, "[ABT] [suppressed]\n";
3481 }
3482}
3483
3484# load additional modules
3485use cf::pod;
3486
2694END { cf::emergency_save } 3487END { cf::emergency_save }
2695 3488
26961 34891
2697 3490

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines