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.167 by root, Sat Jan 13 23:32:43 2007 UTC vs.
Revision 1.322 by root, Fri Jul 27 10:10:51 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;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.3 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
25use JSON::XS 1.4 ();
26use BDB ();
20use Data::Dumper; 27use Data::Dumper;
21use Digest::MD5; 28use Digest::MD5;
22use Fcntl; 29use Fcntl;
30use YAML::Syck ();
23use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 32use Time::HiRes;
33use Compress::LZF;
34use Digest::MD5 ();
26 35
36# configure various modules to our taste
37#
38$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 42$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 43
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
33 46
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 48
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50
36our %COMMAND = (); 51our %COMMAND = ();
37our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
38 53
39our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
43 59
60our $RELOAD; # number of reloads so far
44our @EVENT; 61our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 62
47our $TICK = MAX_TIME * 1e-6; 63our $CONFDIR = confdir;
64our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db";
74
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 79our $NEXT_TICK;
50our $NOW; 80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off
82
83our $BDB_POLL_WATCHER;
84our $DB_ENV;
51 85
52our %CFG; 86our %CFG;
53 87
54our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 89our $RUNTIME;
56 90
57our %PLAYER; # all users 91our %PLAYER; # all users
58our %MAP; # all maps 92our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 93our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random";
61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64 94
65# used to convert map paths into valid unix filenames by replacing / by ∕ 95# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
67 97
98our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing
100our $tick_start; # for load detecting purposes
101
68binmode STDOUT; 102binmode STDOUT;
69binmode STDERR; 103binmode STDERR;
70 104
71# read virtual server time, if available 105# read virtual server time, if available
72unless ($RUNTIME || !-e cf::localdir . "/runtime") { 106unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
73 open my $fh, "<", cf::localdir . "/runtime" 107 open my $fh, "<", "$LOCALDIR/runtime"
74 or die "unable to read runtime file: $!"; 108 or die "unable to read runtime file: $!";
75 $RUNTIME = <$fh> + 0.; 109 $RUNTIME = <$fh> + 0.;
76} 110}
77 111
78mkdir cf::localdir; 112mkdir $_
79mkdir cf::localdir . "/" . cf::playerdir; 113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
80mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS;
83 114
84our $EMERGENCY_POSITION; 115our $EMERGENCY_POSITION;
116
117sub cf::map::normalise;
85 118
86############################################################################# 119#############################################################################
87 120
88=head2 GLOBAL VARIABLES 121=head2 GLOBAL VARIABLES
89 122
96=item $cf::RUNTIME 129=item $cf::RUNTIME
97 130
98The time this server has run, starts at 0 and is increased by $cf::TICK on 131The time this server has run, starts at 0 and is increased by $cf::TICK on
99every server tick. 132every server tick.
100 133
101=item $cf::LIBDIR 134=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
135$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
136$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
102 137
103The perl library directory, where extensions and cf-specific modules can 138Various directories - "/etc", read-only install directory, perl-library
104be found. It will be added to C<@INC> automatically. 139directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
140unique-items directory, player file directory, random maps directory and
141database environment.
105 142
106=item $cf::NOW 143=item $cf::NOW
107 144
108The time of the last (current) server tick. 145The time of the last (current) server tick.
109 146
110=item $cf::TICK 147=item $cf::TICK
111 148
112The interval between server ticks, in seconds. 149The interval between server ticks, in seconds.
150
151=item $cf::LOADAVG
152
153The current CPU load on the server (alpha-smoothed), as a value between 0
154(none) and 1 (overloaded), indicating how much time is spent on processing
155objects per tick. Healthy values are < 0.5.
156
157=item $cf::LOAD
158
159The raw value load value from the last tick.
113 160
114=item %cf::CFG 161=item %cf::CFG
115 162
116Configuration for the server, loaded from C</etc/crossfire/config>, or 163Configuration for the server, loaded from C</etc/crossfire/config>, or
117from wherever your confdir points to. 164from wherever your confdir points to.
118 165
119=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 166=item cf::wait_for_tick, cf::wait_for_tick_begin
120 167
121These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
122or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 169returns directly I<after> the tick processing (and consequently, can only wake one process
123processing has been done. Call C<< ->wait >> on them to maximise the 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
124window of cpu time available, or simply to synchronise to the server tick. 171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
125 177
126=back 178=back
127 179
128=cut 180=cut
129 181
130BEGIN { 182BEGIN {
131 *CORE::GLOBAL::warn = sub { 183 *CORE::GLOBAL::warn = sub {
132 my $msg = join "", @_; 184 my $msg = join "", @_;
133 utf8::encode $msg;
134 185
135 $msg .= "\n" 186 $msg .= "\n"
136 unless $msg =~ /\n$/; 187 unless $msg =~ /\n$/;
137 188
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190
191 utf8::encode $msg;
138 LOG llevError, $msg; 192 LOG llevError, $msg;
139 }; 193 };
140} 194}
141 195
142@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
143@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
144@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
145@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
146@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 200@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
201@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
147@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 202@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
148 203
149# we bless all objects into (empty) derived classes to force a method lookup 204# we bless all objects into (empty) derived classes to force a method lookup
150# within the Safe compartment. 205# within the Safe compartment.
151for my $pkg (qw( 206for my $pkg (qw(
152 cf::global cf::attachable 207 cf::global cf::attachable
160} 215}
161 216
162$Event::DIED = sub { 217$Event::DIED = sub {
163 warn "error in event callback: @_"; 218 warn "error in event callback: @_";
164}; 219};
220
221#############################################################################
165 222
166=head2 UTILITY FUNCTIONS 223=head2 UTILITY FUNCTIONS
167 224
168=over 4 225=over 4
169 226
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d 246 $d
190 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
191} 248}
192 249
193use JSON::Syck (); # TODO# replace by JSON::PC once working
194
195=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
196 251
197Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
198 253
199=cut
200
201sub from_json($) {
202 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
203 JSON::Syck::Load $_[0]
204}
205
206=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
207 255
208Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
209 257
210=cut 258=cut
211 259
212sub to_json($) { 260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 261
214 JSON::Syck::Dump $_[0] 262sub to_json ($) { $json_coder->encode ($_[0]) }
215} 263sub from_json ($) { $json_coder->decode ($_[0]) }
216 264
217=item cf::lock_wait $string 265=item cf::lock_wait $string
218 266
219Wait until the given lock is available. See cf::lock_acquire. 267Wait until the given lock is available. See cf::lock_acquire.
220 268
226returned. 274returned.
227 275
228Lock names should begin with a unique identifier (for example, cf::map::find 276Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load). 277uses map_find and cf::map::load uses map_load).
230 278
279=item $locked = cf::lock_active $string
280
281Return true if the lock is currently active, i.e. somebody has locked it.
282
231=cut 283=cut
232 284
233our %LOCK; 285our %LOCK;
234 286
235sub lock_wait($) { 287sub lock_wait($) {
254 # wake up all waiters, to be on the safe side 306 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} }; 307 $_->ready for @{ delete $LOCK{$key} };
256 } 308 }
257} 309}
258 310
311sub lock_active($) {
312 my ($key) = @_;
313
314 ! ! $LOCK{$key}
315}
316
259sub freeze_mainloop { 317sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 318 return unless $TICK_WATCHER->is_active;
261 319
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 320 my $guard = Coro::guard {
321 $TICK_WATCHER->start;
322 };
263 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
264 $guard 324 $guard
325}
326
327=item cf::get_slot $time[, $priority[, $name]]
328
329Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede.
332
333The optional C<$name> can be used to identify the job to run. It might be
334used for statistical purposes and should identify the same time-class.
335
336Useful for short background jobs.
337
338=cut
339
340our @SLOT_QUEUE;
341our $SLOT_QUEUE;
342
343$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async {
345 my $signal = new Coro::Signal;
346
347 while () {
348 next_job:
349 my $avail = cf::till_tick;
350 if ($avail > 0.01) {
351 for (0 .. $#SLOT_QUEUE) {
352 if ($SLOT_QUEUE[$_][0] < $avail) {
353 my $job = splice @SLOT_QUEUE, $_, 1, ();
354 $job->[2]->send;
355 Coro::cede;
356 goto next_job;
357 }
358 }
359 }
360
361 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait;
365 } else {
366 Coro::schedule;
367 }
368 }
369};
370
371sub get_slot($;$$) {
372 my ($time, $pri, $name) = @_;
373
374 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal;
376
377 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379 $SLOT_QUEUE->ready;
380 $sig->wait;
265} 381}
266 382
267=item cf::async { BLOCK } 383=item cf::async { BLOCK }
268 384
269Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
274 390
275BEGIN { *async = \&Coro::async_pool } 391BEGIN { *async = \&Coro::async_pool }
276 392
277=item cf::sync_job { BLOCK } 393=item cf::sync_job { BLOCK }
278 394
279The design of crossfire+ requires that the main coro ($Coro::main) is 395The design of Crossfire TRT requires that the main coroutine ($Coro::main)
280always able to handle events or runnable, as crossfire+ is only partly 396is always able to handle events or runnable, as Crossfire TRT is only
281reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable.
282 399
283If it must be done, put the blocking parts into C<sync_job>. This will run 400If it must be done, put the blocking parts into C<sync_job>. This will run
284the given BLOCK in another coroutine while waiting for the result. The 401the given BLOCK in another coroutine while waiting for the result. The
285server will be frozen during this time, so the block should either finish 402server will be frozen during this time, so the block should either finish
286fast or be very important. 403fast or be very important.
289 406
290sub sync_job(&) { 407sub sync_job(&) {
291 my ($job) = @_; 408 my ($job) = @_;
292 409
293 if ($Coro::current == $Coro::main) { 410 if ($Coro::current == $Coro::main) {
411 my $time = Event::time;
412
294 # this is the main coro, too bad, we have to block 413 # this is the main coro, too bad, we have to block
295 # till the operation succeeds, freezing the server :/ 414 # till the operation succeeds, freezing the server :/
296 415
297 # TODO: use suspend/resume instead 416 # TODO: use suspend/resume instead
298 # (but this is cancel-safe) 417 # (but this is cancel-safe)
309 428
310 while ($busy) { 429 while ($busy) {
311 Coro::cede or Event::one_event; 430 Coro::cede or Event::one_event;
312 } 431 }
313 432
433 $time = Event::time - $time;
434
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load
439
314 wantarray ? @res : $res[0] 440 wantarray ? @res : $res[0]
315 } else { 441 } else {
316 # we are in another coroutine, how wonderful, everything just works 442 # we are in another coroutine, how wonderful, everything just works
317 443
318 $job->() 444 $job->()
337 $EXT_CORO{$coro+0} = $coro; 463 $EXT_CORO{$coro+0} = $coro;
338 464
339 $coro 465 $coro
340} 466}
341 467
342sub write_runtime { 468=item fork_call { }, $args
343 return unless $TICK_WATCHER->is_active;
344 469
345 my $runtime = cf::localdir . "/runtime"; 470Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling.
346 474
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 475=cut
348 or return;
349 476
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 477sub _store_scalar {
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 478 open my $fh, ">", \my $buf
352 and return; 479 or die "fork_call: cannot open fh-to-buf in child : $!";
353 480 Storable::store_fd $_[0], $fh;
354 aio_fsync $fh
355 and return;
356
357 close $fh 481 close $fh;
358 or return;
359 482
360 aio_rename "$runtime~", $runtime 483 $buf
361 and return; 484}
362 485
486sub fork_call(&@) {
487 my ($cb, @args) = @_;
488
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
490# or die "socketpair: $!";
491 pipe my $fh1, my $fh2
492 or die "pipe: $!";
493
494 if (my $pid = fork) {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals;
508 local $SIG{__WARN__};
509 local $SIG{__DIE__};
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515
516 eval {
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
363 1 527 }
528}
529
530=item $value = cf::db_get $family => $key
531
532Returns a single value from the environment database.
533
534=item cf::db_put $family => $key => $value
535
536Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538
539=cut
540
541our $DB;
542
543sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job {
548 eval {
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 }
558}
559
560sub db_get($$) {
561 my $key = "$_[0]/$_[1]";
562
563 cf::sync_job {
564 BDB::db_get $DB, undef, $key, my $data;
565
566 $! ? ()
567 : $data
568 }
569}
570
571sub db_put($$$) {
572 BDB::dbreq_pri 4;
573 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
574}
575
576=item cf::cache $id => [$paths...], $processversion => $process
577
578Generic caching function that returns the value of the resource $id,
579caching and regenerating as required.
580
581This function can block.
582
583=cut
584
585sub cache {
586 my ($id, $src, $processversion, $process) = @_;
587
588 my $meta =
589 join "\x00",
590 $processversion,
591 map {
592 aio_stat $_
593 and Carp::croak "$_: $!";
594
595 ($_, (stat _)[7,9])
596 } @$src;
597
598 my $dbmeta = db_get cache => "$id/meta";
599 if ($dbmeta ne $meta) {
600 # changed, we may need to process
601
602 my @data;
603 my $md5;
604
605 for (0 .. $#$src) {
606 0 <= aio_load $src->[$_], $data[$_]
607 or Carp::croak "$src->[$_]: $!";
608 }
609
610 # if processing is expensive, check
611 # checksum first
612 if (1) {
613 $md5 =
614 join "\x00",
615 $processversion,
616 map {
617 Coro::cede;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src;
620
621
622 my $dbmd5 = db_get cache => "$id/md5";
623 if ($dbmd5 eq $md5) {
624 db_put cache => "$id/meta", $meta;
625
626 return db_get cache => "$id/data";
627 }
628 }
629
630 my $t1 = Time::HiRes::time;
631 my $data = $process->(\@data);
632 my $t2 = Time::HiRes::time;
633
634 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
635
636 db_put cache => "$id/data", $data;
637 db_put cache => "$id/md5" , $md5;
638 db_put cache => "$id/meta", $meta;
639
640 return $data;
641 }
642
643 db_get cache => "$id/data"
644}
645
646=item cf::datalog type => key => value, ...
647
648Log a datalog packet of the given type with the given key-value pairs.
649
650=cut
651
652sub datalog($@) {
653 my ($type, %kv) = @_;
654 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
364} 655}
365 656
366=back 657=back
367 658
368=cut 659=cut
375attach callbacks/event handlers (a collection of which is called an "attachment") 666attach callbacks/event handlers (a collection of which is called an "attachment")
376to it. All such attachable objects support the following methods. 667to it. All such attachable objects support the following methods.
377 668
378In the following description, CLASS can be any of C<global>, C<object> 669In the following description, CLASS can be any of C<global>, C<object>
379C<player>, C<client> or C<map> (i.e. the attachable objects in 670C<player>, C<client> or C<map> (i.e. the attachable objects in
380crossfire+). 671Crossfire TRT).
381 672
382=over 4 673=over 4
383 674
384=item $attachable->attach ($attachment, key => $value...) 675=item $attachable->attach ($attachment, key => $value...)
385 676
499our @CB_TYPE = (); # registry for type (cf-object class) based events 790our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 791our @CB_MAP = ();
501 792
502my %attachment; 793my %attachment;
503 794
795sub cf::attachable::thawer_merge {
796 # simply override everything except _meta
797 local $_[0]{_meta};
798 %{$_[0]} = %{$_[1]};
799}
800
504sub _attach_cb($$$$) { 801sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 802 my ($registry, $event, $prio, $cb) = @_;
506 803
507 use sort 'stable'; 804 use sort 'stable';
508 805
542 $registry = $CB_TYPE[$object_type] ||= []; 839 $registry = $CB_TYPE[$object_type] ||= [];
543 840
544 } elsif ($type eq "subtype") { 841 } elsif ($type eq "subtype") {
545 defined $object_type or Carp::croak "subtype specified without type"; 842 defined $object_type or Carp::croak "subtype specified without type";
546 my $object_subtype = shift @arg; 843 my $object_subtype = shift @arg;
547 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 844 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
548 845
549 } elsif ($type eq "package") { 846 } elsif ($type eq "package") {
550 my $pkg = shift @arg; 847 my $pkg = shift @arg;
551 848
552 while (my ($name, $id) = each %cb_id) { 849 while (my ($name, $id) = each %cb_id) {
581 _attach $registry, $klass, @attach; 878 _attach $registry, $klass, @attach;
582 } 879 }
583 880
584 $obj->{$name} = \%arg; 881 $obj->{$name} = \%arg;
585 } else { 882 } else {
586 warn "object uses attachment '$name' that is not available, postponing.\n"; 883 warn "object uses attachment '$name' which is not available, postponing.\n";
587 } 884 }
588 885
589 $obj->{_attachment}{$name} = undef; 886 $obj->{_attachment}{$name} = undef;
590} 887}
591 888
593 if (ref $_[0]) { 890 if (ref $_[0]) {
594 _object_attach @_; 891 _object_attach @_;
595 } else { 892 } else {
596 _attach shift->_attach_registry, @_; 893 _attach shift->_attach_registry, @_;
597 } 894 }
895 _recalc_want;
598}; 896};
599 897
600# all those should be optimised 898# all those should be optimised
601sub cf::attachable::detach { 899sub cf::attachable::detach {
602 my ($obj, $name) = @_; 900 my ($obj, $name) = @_;
605 delete $obj->{_attachment}{$name}; 903 delete $obj->{_attachment}{$name};
606 reattach ($obj); 904 reattach ($obj);
607 } else { 905 } else {
608 Carp::croak "cannot, currently, detach class attachments"; 906 Carp::croak "cannot, currently, detach class attachments";
609 } 907 }
908 _recalc_want;
610}; 909};
611 910
612sub cf::attachable::attached { 911sub cf::attachable::attached {
613 my ($obj, $name) = @_; 912 my ($obj, $name) = @_;
614 913
629 "; 928 ";
630 die if $@; 929 die if $@;
631} 930}
632 931
633our $override; 932our $override;
634our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 933our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
635 934
636sub override { 935sub override {
637 $override = 1; 936 $override = 1;
638 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
639} 938}
640 939
641sub do_invoke { 940sub do_invoke {
642 my $event = shift; 941 my $event = shift;
643 my $callbacks = shift; 942 my $callbacks = shift;
644 943
645 @invoke_results = (); 944 @INVOKE_RESULTS = ();
646 945
647 local $override; 946 local $override;
648 947
649 for (@$callbacks) { 948 for (@$callbacks) {
650 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
667 966
668Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
669 968
670This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 969This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
671removed in future versions), and there is no public API to access override 970removed in future versions), and there is no public API to access override
672results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
673 972
674=back 973=back
675 974
676=cut 975=cut
677 976
678############################################################################# 977#############################################################################
679# object support 978# object support
979#
980
981sub _can_merge {
982 my ($ob1, $ob2) = @_;
983
984 local $Storable::canonical = 1;
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987
988 $fob1 eq $fob2
989}
680 990
681sub reattach { 991sub reattach {
682 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 993 my ($obj) = @_;
994
995 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 996
685 my $registry = $obj->registry; 997 my $registry = $obj->registry;
686 998
687 @$registry = (); 999 @$registry = ();
688 1000
735 $filename, length $$rdata, scalar @$objs; 1047 $filename, length $$rdata, scalar @$objs;
736 1048
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 1052 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 1053 close $fh;
742 1054
743 if (@$objs) { 1055 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 1057 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1058 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 1059 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 1060 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 1061 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 1062 aio_rename "$filename.pst~", "$filename.pst";
751 } 1063 }
752 } else { 1064 } else {
753 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
785 or return; 1097 or return;
786 $av = eval { (Storable::thaw $av)->{objs} }; 1098 $av = eval { (Storable::thaw $av)->{objs} };
787 } 1099 }
788 1100
789 warn sprintf "loading %s (%d)\n", 1101 warn sprintf "loading %s (%d)\n",
790 $filename, length $data, scalar @{$av || []};#d# 1102 $filename, length $data, scalar @{$av || []};
791 return ($data, $av); 1103 return ($data, $av);
792} 1104}
1105
1106=head2 COMMAND CALLBACKS
1107
1108=over 4
1109
1110=cut
793 1111
794############################################################################# 1112#############################################################################
795# command handling &c 1113# command handling &c
796 1114
797=item cf::register_command $name => \&callback($ob,$args); 1115=item cf::register_command $name => \&callback($ob,$args);
810 push @{ $COMMAND{$name} }, [$caller, $cb]; 1128 push @{ $COMMAND{$name} }, [$caller, $cb];
811} 1129}
812 1130
813=item cf::register_extcmd $name => \&callback($pl,$packet); 1131=item cf::register_extcmd $name => \&callback($pl,$packet);
814 1132
815Register a callbackf ro execution when the client sends an extcmd packet. 1133Register a callback for execution when the client sends an (synchronous)
1134extcmd packet. Ext commands will be processed in the order they are
1135received by the server, like other user commands. The first argument is
1136the logged-in player. Ext commands can only be processed after a player
1137has logged in successfully.
816 1138
817If the callback returns something, it is sent back as if reply was being 1139If the callback returns something, it is sent back as if reply was being
818called. 1140called.
819 1141
1142=item cf::register_exticmd $name => \&callback($ns,$packet);
1143
1144Register a callback for execution when the client sends an (asynchronous)
1145exticmd packet. Exti commands are processed by the server as soon as they
1146are received, i.e. out of order w.r.t. other commands. The first argument
1147is a client socket. Exti commands can be received anytime, even before
1148log-in.
1149
1150If the callback returns something, it is sent back as if reply was being
1151called.
1152
820=cut 1153=cut
821 1154
822sub register_extcmd { 1155sub register_extcmd {
823 my ($name, $cb) = @_; 1156 my ($name, $cb) = @_;
824 1157
825 $EXTCMD{$name} = $cb; 1158 $EXTCMD{$name} = $cb;
1159}
1160
1161sub register_exticmd {
1162 my ($name, $cb) = @_;
1163
1164 $EXTICMD{$name} = $cb;
826} 1165}
827 1166
828cf::player->attach ( 1167cf::player->attach (
829 on_command => sub { 1168 on_command => sub {
830 my ($pl, $name, $params) = @_; 1169 my ($pl, $name, $params) = @_;
839 cf::override; 1178 cf::override;
840 }, 1179 },
841 on_extcmd => sub { 1180 on_extcmd => sub {
842 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
843 1182
844 my $msg = eval { from_json $buf }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
845 1184
846 if (ref $msg) { 1185 if (ref $msg) {
1186 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg
1188 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190
847 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
848 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
849 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
850 } 1195 if $reply;
851 } 1196 }
852 } else { 1197 } else {
853 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
854 } 1199 }
855 1200
856 cf::override; 1201 cf::override;
857 }, 1202 },
858); 1203);
859 1204
860sub load_extension {
861 my ($path) = @_;
862
863 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
864 my $base = $1;
865 my $pkg = $1;
866 $pkg =~ s/[^[:word:]]/_/g;
867 $pkg = "ext::$pkg";
868
869 warn "... loading '$path' into '$pkg'\n";
870
871 open my $fh, "<:utf8", $path
872 or die "$path: $!";
873
874 my $source =
875 "package $pkg; use strict; use utf8;\n"
876 . "#line 1 \"$path\"\n{\n"
877 . (do { local $/; <$fh> })
878 . "\n};\n1";
879
880 unless (eval $source) {
881 my $msg = $@ ? "$path: $@\n"
882 : "extension disabled.\n";
883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
884 warn $@;
885 warn "mandatory extension failed to load, exiting.\n";
886 exit 1;
887 }
888 die $@;
889 }
890
891 push @EXTS, $pkg;
892}
893
894sub load_extensions { 1205sub load_extensions {
1206 cf::sync_job {
1207 my %todo;
1208
895 for my $ext (<$LIBDIR/*.ext>) { 1209 for my $path (<$LIBDIR/*.ext>) {
896 next unless -r $ext; 1210 next unless -r $path;
897 eval { 1211
898 load_extension $ext; 1212 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1213 my $base = $1;
1214 my $pkg = $1;
1215 $pkg =~ s/[^[:word:]]/_/g;
1216 $pkg = "ext::$pkg";
1217
1218 open my $fh, "<:utf8", $path
1219 or die "$path: $!";
1220
1221 my $source = do { local $/; <$fh> };
1222
1223 my %ext = (
1224 path => $path,
1225 base => $base,
1226 pkg => $pkg,
1227 );
1228
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231
1232 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n"
1235 . $source
1236 . "\n};\n1";
1237
1238 $todo{$base} = \%ext;
1239 }
1240
1241 my %done;
1242 while (%todo) {
1243 my $progress;
1244
1245 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip
1248 unless exists $done{$_};
1249 }
1250
1251 warn "... loading '$k' into '$v->{pkg}'\n";
1252
1253 unless (eval $v->{source}) {
1254 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n";
1256
1257 if (exists $v->{meta}{mandatory}) {
1258 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n";
1260 exit 1;
1261 }
1262
1263 warn $msg;
1264 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
899 1 1269 }
900 } or warn "$ext not loaded: $@"; 1270
1271 skip:
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1273 unless $progress;
1274 }
901 } 1275 };
902} 1276}
903 1277
904############################################################################# 1278#############################################################################
905 1279
1280=back
1281
906=head2 CORE EXTENSIONS 1282=head2 CORE EXTENSIONS
907 1283
908Functions and methods that extend core crossfire objects. 1284Functions and methods that extend core crossfire objects.
909 1285
910=cut 1286=cut
922Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
923 1299
924=cut 1300=cut
925 1301
926sub playerdir($) { 1302sub playerdir($) {
927 cf::localdir 1303 "$PLAYERDIR/"
928 . "/"
929 . cf::playerdir
930 . "/"
931 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1304 . (ref $_[0] ? $_[0]->ob->name : $_[0])
932} 1305}
933 1306
934sub path($) { 1307sub path($) {
935 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1308 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
936 1309
937 (playerdir $login) . "/$login.pl" 1310 (playerdir $login) . "/playerdata"
938} 1311}
939 1312
940sub find_active($) { 1313sub find_active($) {
941 $cf::PLAYER{$_[0]} 1314 $cf::PLAYER{$_[0]}
942 and $cf::PLAYER{$_[0]}->active 1315 and $cf::PLAYER{$_[0]}->active
945 1318
946sub exists($) { 1319sub exists($) {
947 my ($login) = @_; 1320 my ($login) = @_;
948 1321
949 $cf::PLAYER{$login} 1322 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login } 1323 or cf::sync_job { !aio_stat path $login }
951} 1324}
952 1325
953sub find($) { 1326sub find($) {
954 return $cf::PLAYER{$_[0]} || do { 1327 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0]; 1328 my $login = $_[0];
956 1329
957 my $guard = cf::lock_acquire "user_find:$login"; 1330 my $guard = cf::lock_acquire "user_find:$login";
958 1331
959 $cf::PLAYER{$_[0]} || do { 1332 $cf::PLAYER{$_[0]} || do {
1333 # rename old playerfiles to new ones
1334 #TODO: remove when no longer required
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl";
1339
960 my $pl = load_pl path $login 1340 my $pl = load_pl path $login
961 or return; 1341 or return;
962 $cf::PLAYER{$login} = $pl 1342 $cf::PLAYER{$login} = $pl
963 } 1343 }
964 } 1344 }
1001 1381
1002=cut 1382=cut
1003 1383
1004sub quit_character { 1384sub quit_character {
1005 my ($pl) = @_; 1385 my ($pl) = @_;
1386
1387 my $name = $pl->ob->name;
1006 1388
1007 $pl->{deny_save} = 1; 1389 $pl->{deny_save} = 1;
1008 $pl->password ("*"); # this should lock out the player until we nuked the dir 1390 $pl->password ("*"); # this should lock out the player until we nuked the dir
1009 1391
1010 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1015 my $path = playerdir $pl; 1397 my $path = playerdir $pl;
1016 my $temp = "$path~$cf::RUNTIME~deleting~"; 1398 my $temp = "$path~$cf::RUNTIME~deleting~";
1017 aio_rename $path, $temp; 1399 aio_rename $path, $temp;
1018 delete $cf::PLAYER{$pl->ob->name}; 1400 delete $cf::PLAYER{$pl->ob->name};
1019 $pl->destroy; 1401 $pl->destroy;
1402
1403 my $prefix = qr<^~\Q$name\E/>;
1404
1405 # nuke player maps
1406 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1407
1020 IO::AIO::aio_rmtree $temp; 1408 IO::AIO::aio_rmtree $temp;
1409}
1410
1411=item $pl->kick
1412
1413Kicks a player out of the game. This destroys the connection.
1414
1415=cut
1416
1417sub kick {
1418 my ($pl, $kicker) = @_;
1419
1420 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1421 $pl->killer ("kicked");
1422 $pl->ns->destroy;
1021} 1423}
1022 1424
1023=item cf::player::list_logins 1425=item cf::player::list_logins
1024 1426
1025Returns am arrayref of all valid playernames in the system, can take a 1427Returns am arrayref of all valid playernames in the system, can take a
1026while and may block, so not sync_job-capable, ever. 1428while and may block, so not sync_job-capable, ever.
1027 1429
1028=cut 1430=cut
1029 1431
1030sub list_logins { 1432sub list_logins {
1031 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1433 my $dirs = aio_readdir $PLAYERDIR
1032 or return []; 1434 or return [];
1033 1435
1034 my @logins; 1436 my @logins;
1035 1437
1036 for my $login (@$dirs) { 1438 for my $login (@$dirs) {
1053=cut 1455=cut
1054 1456
1055sub maps($) { 1457sub maps($) {
1056 my ($pl) = @_; 1458 my ($pl) = @_;
1057 1459
1460 $pl = ref $pl ? $pl->ob->name : $pl;
1461
1058 my $files = aio_readdir playerdir $pl 1462 my $files = aio_readdir playerdir $pl
1059 or return; 1463 or return;
1060 1464
1061 my @paths; 1465 my @paths;
1062 1466
1063 for (@$files) { 1467 for (@$files) {
1064 utf8::decode $_; 1468 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/; 1469 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o; 1470 next unless /^$PATH_SEP/o;
1067 1471
1068 s/\.map$//; 1472 push @paths, cf::map::normalise "~$pl/$_";
1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1070 } 1473 }
1071 1474
1072 \@paths 1475 \@paths
1073} 1476}
1074 1477
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1479
1480Expand crossfire pod fragments into protocol xml.
1481
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1075=item $player->ext_reply ($msgid, $msgtype, %msg) 1528=item $player->ext_reply ($msgid, @msg)
1076 1529
1077Sends an ext reply to the player. 1530Sends an ext reply to the player.
1078 1531
1079=cut 1532=cut
1080 1533
1081sub ext_reply($$$%) { 1534sub ext_reply($$@) {
1082 my ($self, $id, %msg) = @_; 1535 my ($self, $id, @msg) = @_;
1083 1536
1084 $msg{msgid} = $id; 1537 if ($self->ns->extcmd == 2) {
1085 1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1086 $self->send ("ext " . cf::to_json \%msg); 1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1087} 1544}
1088 1545
1089package cf; 1546=item $player->ext_msg ($type, @msg)
1547
1548Sends an ext event to the client.
1549
1550=cut
1551
1552sub ext_msg($$@) {
1553 my ($self, $type, @msg) = @_;
1554
1555 $self->ns->ext_msg ($type, @msg);
1556}
1557
1558=head3 cf::region
1559
1560=over 4
1561
1562=cut
1563
1564package cf::region;
1565
1566=item cf::region::find_by_path $path
1567
1568Tries to decuce the likely region for a map knowing only its path.
1569
1570=cut
1571
1572sub find_by_path($) {
1573 my ($path) = @_;
1574
1575 my ($match, $specificity);
1576
1577 for my $region (list) {
1578 if ($region->{match} && $path =~ $region->{match}) {
1579 ($match, $specificity) = ($region, $region->specificity)
1580 if $region->specificity > $specificity;
1581 }
1582 }
1583
1584 $match
1585}
1090 1586
1091=back 1587=back
1092
1093 1588
1094=head3 cf::map 1589=head3 cf::map
1095 1590
1096=over 4 1591=over 4
1097 1592
1101 1596
1102use Fcntl; 1597use Fcntl;
1103use Coro::AIO; 1598use Coro::AIO;
1104 1599
1105use overload 1600use overload
1106 '""' => \&as_string; 1601 '""' => \&as_string,
1602 fallback => 1;
1107 1603
1108our $MAX_RESET = 3600; 1604our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1605our $DEFAULT_RESET = 3000;
1110 1606
1111sub generate_random_map { 1607sub generate_random_map {
1112 my ($self, $rmp) = @_; 1608 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1609 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1610 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1620 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1126 (cf::region::find $rmp->{region}), $rmp->{custom} 1621 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 ) 1622 )
1128} 1623}
1129 1624
1625=item cf::map->register ($regex, $prio)
1626
1627Register a handler for the map path matching the given regex at the
1628givne priority (higher is better, built-in handlers have priority 0, the
1629default).
1630
1631=cut
1632
1130sub register { 1633sub register {
1131 my (undef, $regex) = @_; 1634 my (undef, $regex, $prio) = @_;
1132 my $pkg = caller; 1635 my $pkg = caller;
1133 1636
1134 no strict; 1637 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__; 1638 push @{"$pkg\::ISA"}, __PACKAGE__;
1136 1639
1137 $EXT_MAP{$pkg} = qr<$regex>; 1640 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1138} 1641}
1139 1642
1140# also paths starting with '/' 1643# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1644$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1645
1646sub thawer_merge {
1647 my ($self, $merge) = @_;
1648
1649 # we have to keep some variables in memory intact
1650 local $self->{path};
1651 local $self->{load_path};
1652
1653 $self->SUPER::thawer_merge ($merge);
1654}
1142 1655
1143sub normalise { 1656sub normalise {
1144 my ($path, $base) = @_; 1657 my ($path, $base) = @_;
1658
1659 $path = "$path"; # make sure its a string
1660
1661 $path =~ s/\.map$//;
1145 1662
1146 # map plan: 1663 # map plan:
1147 # 1664 #
1148 # /! non-realised random map exit (special hack!) 1665 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched 1666 # {... are special paths that are not being touched
1177 1694
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1695 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179 1696
1180 $path = normalise $path, $base; 1697 $path = normalise $path, $base;
1181 1698
1182 for my $pkg (keys %EXT_MAP) { 1699 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) { 1700 if ($path =~ $EXT_MAP{$pkg}[1]) {
1184 my $self = bless cf::map::new, $pkg; 1701 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path); 1702 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc. 1703 $self->init; # pass $1 etc.
1187 return $self; 1704 return $self;
1188 } 1705 }
1189 } 1706 }
1190 1707
1191 Carp::carp "unable to resolve path '$path'."; 1708 Carp::cluck "unable to resolve path '$path' (base '$base').";
1192 () 1709 ()
1193} 1710}
1194 1711
1195sub init { 1712sub init {
1196 my ($self) = @_; 1713 my ($self) = @_;
1211 1728
1212# the original (read-only) location 1729# the original (read-only) location
1213sub load_path { 1730sub load_path {
1214 my ($self) = @_; 1731 my ($self) = @_;
1215 1732
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1733 "$MAPDIR/$self->{path}.map"
1217} 1734}
1218 1735
1219# the temporary/swap location 1736# the temporary/swap location
1220sub save_path { 1737sub save_path {
1221 my ($self) = @_; 1738 my ($self) = @_;
1222 1739
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1741 "$TMPDIR/$path.map"
1225} 1742}
1226 1743
1227# the unique path, undef == no special unique path 1744# the unique path, undef == no special unique path
1228sub uniq_path { 1745sub uniq_path {
1229 my ($self) = @_; 1746 my ($self) = @_;
1230 1747
1231 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1232 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1749 "$UNIQUEDIR/$path"
1233} 1750}
1234 1751
1235# and all this just because we cannot iterate over 1752# and all this just because we cannot iterate over
1236# all maps in C++... 1753# all maps in C++...
1237sub change_all_map_light { 1754sub change_all_map_light {
1239 1756
1240 $_->change_map_light ($change) 1757 $_->change_map_light ($change)
1241 for grep $_->outdoor, values %cf::MAP; 1758 for grep $_->outdoor, values %cf::MAP;
1242} 1759}
1243 1760
1761sub decay_objects {
1762 my ($self) = @_;
1763
1764 return if $self->{deny_reset};
1765
1766 $self->do_decay_objects;
1767}
1768
1244sub unlink_save { 1769sub unlink_save {
1245 my ($self) = @_; 1770 my ($self) = @_;
1246 1771
1247 utf8::encode (my $save = $self->save_path); 1772 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1773 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1774 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1250} 1775}
1251 1776
1252sub load_header_from($) { 1777sub load_header_from($) {
1253 my ($self, $path) = @_; 1778 my ($self, $path) = @_;
1254 1779
1255 utf8::encode $path; 1780 utf8::encode $path;
1256 aio_open $path, O_RDONLY, 0 1781 #aio_open $path, O_RDONLY, 0
1257 or return; 1782 # or return;
1258 1783
1259 $self->_load_header ($path) 1784 $self->_load_header ($path)
1260 or return; 1785 or return;
1261 1786
1262 $self->{load_path} = $path; 1787 $self->{load_path} = $path;
1263 1788
1264 1 1789 1
1265} 1790}
1266 1791
1267sub load_orig { 1792sub load_header_orig {
1268 my ($self) = @_; 1793 my ($self) = @_;
1269 1794
1270 $self->load_header_from ($self->load_path) 1795 $self->load_header_from ($self->load_path)
1271} 1796}
1272 1797
1273sub load_temp { 1798sub load_header_temp {
1274 my ($self) = @_; 1799 my ($self) = @_;
1275 1800
1276 $self->load_header_from ($self->save_path) 1801 $self->load_header_from ($self->save_path)
1802}
1803
1804sub prepare_temp {
1805 my ($self) = @_;
1806
1807 $self->last_access ((delete $self->{last_access})
1808 || $cf::RUNTIME); #d#
1809 # safety
1810 $self->{instantiate_time} = $cf::RUNTIME
1811 if $self->{instantiate_time} > $cf::RUNTIME;
1812}
1813
1814sub prepare_orig {
1815 my ($self) = @_;
1816
1817 $self->{load_original} = 1;
1818 $self->{instantiate_time} = $cf::RUNTIME;
1819 $self->last_access ($cf::RUNTIME);
1820 $self->instantiate;
1277} 1821}
1278 1822
1279sub load_header { 1823sub load_header {
1280 my ($self) = @_; 1824 my ($self) = @_;
1281 1825
1282 if ($self->load_temp) { 1826 if ($self->load_header_temp) {
1283 $self->last_access ((delete $self->{last_access}) 1827 $self->prepare_temp;
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else { 1828 } else {
1289 $self->load_orig 1829 $self->load_header_orig
1290 or return; 1830 or return;
1291 1831 $self->prepare_orig;
1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 } 1832 }
1833
1834 $self->{deny_reset} = 1
1835 if $self->no_reset;
1836
1837 $self->default_region (cf::region::find_by_path $self->{path})
1838 unless $self->default_region;
1297 1839
1298 1 1840 1
1299} 1841}
1300 1842
1301sub find; 1843sub find;
1314 $map->{last_save} = $cf::RUNTIME; 1856 $map->{last_save} = $cf::RUNTIME;
1315 1857
1316 $map->load_header 1858 $map->load_header
1317 or return; 1859 or return;
1318 1860
1319 if ($map->should_reset) { 1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait;
1320 $map->reset; 1864 $map->reset;
1321 undef $guard; 1865 undef $guard;
1322 $map = find $path 1866 return find $path;
1323 or return;
1324 } 1867 }
1325 1868
1326 $cf::MAP{$path} = $map 1869 $cf::MAP{$path} = $map
1327 } 1870 }
1328} 1871}
1872
1873sub pre_load { }
1874sub post_load { }
1329 1875
1330sub load { 1876sub load {
1331 my ($self) = @_; 1877 my ($self) = @_;
1332 1878
1879 local $self->{deny_reset} = 1; # loading can take a long time
1880
1333 my $path = $self->{path}; 1881 my $path = $self->{path};
1882
1883 {
1334 my $guard = cf::lock_acquire "map_load:$path"; 1884 my $guard = cf::lock_acquire "map_load:$path";
1335 1885
1336 return if $self->in_memory != cf::MAP_SWAPPED; 1886 return if $self->in_memory != cf::MAP_SWAPPED;
1337 1887
1338 $self->in_memory (cf::MAP_LOADING); 1888 $self->in_memory (cf::MAP_LOADING);
1339 1889
1340 $self->alloc; 1890 $self->alloc;
1341 $self->_load_objects ($self->{load_path}, 1)
1342 or return;
1343 1891
1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1892 $self->pre_load;
1345 if delete $self->{load_original};
1346
1347 if (my $uniq = $self->uniq_path) {
1348 utf8::encode $uniq;
1349 if (aio_open $uniq, O_RDONLY, 0) {
1350 $self->clear_unique_items;
1351 $self->_load_objects ($uniq, 0);
1352 }
1353 }
1354
1355 Coro::cede;
1356
1357 # now do the right thing for maps
1358 $self->link_multipart_objects;
1359
1360 unless ($self->{deny_activate}) {
1361 $self->decay_objects;
1362 $self->fix_auto_apply;
1363 $self->update_buttons;
1364 Coro::cede; 1893 Coro::cede;
1365 $self->set_darkness_map; 1894
1895 $self->_load_objects ($self->{load_path}, 1)
1896 or return;
1897
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original};
1900
1901 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) {
1904 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0);
1906 }
1907 }
1908
1909 Coro::cede;
1910 # now do the right thing for maps
1911 $self->link_multipart_objects;
1366 $self->difficulty ($self->estimate_difficulty) 1912 $self->difficulty ($self->estimate_difficulty)
1367 unless $self->difficulty; 1913 unless $self->difficulty;
1368 Coro::cede; 1914 Coro::cede;
1915
1916 unless ($self->{deny_activate}) {
1917 $self->decay_objects;
1918 $self->fix_auto_apply;
1919 $self->update_buttons;
1920 Coro::cede;
1921 $self->set_darkness_map;
1922 Coro::cede;
1369 $self->activate; 1923 $self->activate;
1370 } 1924 }
1371 1925
1372 $self->in_memory (cf::MAP_IN_MEMORY); 1926 $self->in_memory (cf::MAP_IN_MEMORY);
1927 }
1928
1929 $self->post_load;
1373} 1930}
1374 1931
1375sub customise_for { 1932sub customise_for {
1376 my ($self, $ob) = @_; 1933 my ($self, $ob) = @_;
1377 1934
1378 return find "~" . $ob->name . "/" . $self->{path} 1935 return find "~" . $ob->name . "/" . $self->{path}
1379 if $self->per_player; 1936 if $self->per_player;
1937
1938# return find "?party/" . $ob->name . "/" . $self->{path}
1939# if $self->per_party;
1380 1940
1381 $self 1941 $self
1382} 1942}
1383 1943
1384# find and load all maps in the 3x3 area around a map 1944# find and load all maps in the 3x3 area around a map
1416 1976
1417 cf::sync_job { $map->load }; 1977 cf::sync_job { $map->load };
1418} 1978}
1419 1979
1420our %MAP_PREFETCH; 1980our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async { 1981our $MAP_PREFETCHER = undef;
1422 while () {
1423 for my $path (keys %MAP_PREFETCH) {
1424 my $map = find $path
1425 or next;
1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1429 }
1430 Coro::schedule;
1431 }
1432};
1433 1982
1434sub find_async { 1983sub find_async {
1435 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
1436 1985
1437 $path = normalise $path, $origin && $origin->{path}; 1986 $path = normalise $path, $origin && $origin->{path};
1438 1987
1439 if (my $map = $cf::MAP{$path}) { 1988 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1441 } 1990 }
1442 1991
1443 $MAP_PREFETCH{$path} = 0; 1992 undef $MAP_PREFETCH{$path};
1993 $MAP_PREFETCHER ||= cf::async {
1994 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) {
1996 if (my $map = find $path) {
1997 $map->load;
1998 }
1999
2000 delete $MAP_PREFETCH{$path};
2001 }
2002 }
2003 undef $MAP_PREFETCHER;
2004 };
1444 $MAP_PREFETCHER->ready; 2005 $MAP_PREFETCHER->prio (6);
1445 2006
1446 () 2007 ()
1447} 2008}
1448 2009
1449sub save { 2010sub save {
1494 2055
1495sub reset_at { 2056sub reset_at {
1496 my ($self) = @_; 2057 my ($self) = @_;
1497 2058
1498 # TODO: safety, remove and allow resettable per-player maps 2059 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player");
1500 return 1e99 if $self->{deny_reset}; 2060 return 1e99 if $self->{deny_reset};
1501 2061
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2062 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2063 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1504 2064
1509 my ($self) = @_; 2069 my ($self) = @_;
1510 2070
1511 $self->reset_at <= $cf::RUNTIME 2071 $self->reset_at <= $cf::RUNTIME
1512} 2072}
1513 2073
1514sub rename {
1515 my ($self, $new_path) = @_;
1516
1517 normalise $new_path;
1518
1519 $self->unlink_save;
1520
1521 delete $cf::MAP{$self->path};
1522 $self->{path} = $new_path; $self->path ($self->{path});
1523 $cf::MAP{$self->path} = $self;
1524
1525 $self->save;
1526}
1527
1528sub reset { 2074sub reset {
1529 my ($self) = @_; 2075 my ($self) = @_;
1530 2076
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2077 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 2078
1533 return if $self->players; 2079 return if $self->players;
1534 return if $self->isa ("ext::map_per_player");#d#
1535 2080
1536 warn "resetting map ", $self->path;#d# 2081 warn "resetting map ", $self->path;
2082
2083 $self->in_memory (cf::MAP_SWAPPED);
2084
2085 # need to save uniques path
2086 unless ($self->{deny_save}) {
2087 my $uniq = $self->uniq_path; utf8::encode $uniq;
2088
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2090 if $uniq;
2091 }
1537 2092
1538 delete $cf::MAP{$self->path}; 2093 delete $cf::MAP{$self->path};
1539 2094
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear; 2095 $self->clear;
1542 2096
1543 $_->clear_links_to ($self) for values %cf::MAP; 2097 $_->clear_links_to ($self) for values %cf::MAP;
1544 2098
1545 $self->unlink_save; 2099 $self->unlink_save;
1549my $nuke_counter = "aaaa"; 2103my $nuke_counter = "aaaa";
1550 2104
1551sub nuke { 2105sub nuke {
1552 my ($self) = @_; 2106 my ($self) = @_;
1553 2107
2108 delete $cf::MAP{$self->path};
2109
2110 $self->unlink_save;
2111
2112 bless $self, "cf::map";
2113 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 2114 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 2115 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117
2118 $cf::MAP{$self->path} = $self;
2119
1557 $self->reset; # polite request, might not happen 2120 $self->reset; # polite request, might not happen
2121}
2122
2123=item $maps = cf::map::tmp_maps
2124
2125Returns an arrayref with all map paths of currently instantiated and saved
2126maps. May block.
2127
2128=cut
2129
2130sub tmp_maps() {
2131 [
2132 map {
2133 utf8::decode $_;
2134 /\.map$/
2135 ? normalise $_
2136 : ()
2137 } @{ aio_readdir $TMPDIR or [] }
2138 ]
2139}
2140
2141=item $maps = cf::map::random_maps
2142
2143Returns an arrayref with all map paths of currently instantiated and saved
2144random maps. May block.
2145
2146=cut
2147
2148sub random_maps() {
2149 [
2150 map {
2151 utf8::decode $_;
2152 /\.map$/
2153 ? normalise "?random/$_"
2154 : ()
2155 } @{ aio_readdir $RANDOMDIR or [] }
2156 ]
1558} 2157}
1559 2158
1560=item cf::map::unique_maps 2159=item cf::map::unique_maps
1561 2160
1562Returns an arrayref of paths of all shared maps that have 2161Returns an arrayref of paths of all shared maps that have
1563instantiated unique items. May block. 2162instantiated unique items. May block.
1564 2163
1565=cut 2164=cut
1566 2165
1567sub unique_maps() { 2166sub unique_maps() {
1568 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2167 [
1569 or return; 2168 map {
1570
1571 my @paths;
1572
1573 for (@$files) {
1574 utf8::decode $_; 2169 utf8::decode $_;
1575 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o;
1577
1578 s/\.map$//; 2170 /\.map$/
1579 push @paths, $_; 2171 ? normalise $_
2172 : ()
2173 } @{ aio_readdir $UNIQUEDIR or [] }
1580 } 2174 ]
1581
1582 \@paths
1583} 2175}
1584 2176
1585package cf; 2177package cf;
1586 2178
1587=back 2179=back
1633 2225
1634 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2226 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1635 2227
1636 if ($self->{record_replies}) { 2228 if ($self->{record_replies}) {
1637 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2229 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2230
1638 } else { 2231 } else {
2232 my $pl = $self->contr;
2233
2234 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2235 my $dialog = $pl->{npc_dialog};
2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237
2238 } else {
1639 $msg = $npc->name . " says: $msg" if $npc; 2239 $msg = $npc->name . " says: $msg" if $npc;
1640 $self->message ($msg, $flags); 2240 $self->message ($msg, $flags);
2241 }
1641 } 2242 }
1642} 2243}
1643 2244
1644=item $player_object->may ("access") 2245=item $player_object->may ("access")
1645 2246
1678=cut 2279=cut
1679 2280
1680sub link_map { 2281sub link_map {
1681 unless ($LINK_MAP) { 2282 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}" 2283 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2284 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1684 $LINK_MAP->load; 2285 $LINK_MAP->load;
1685 } 2286 }
1686 2287
1687 $LINK_MAP 2288 $LINK_MAP
1688} 2289}
1693 $self->deactivate_recursive; 2294 $self->deactivate_recursive;
1694 2295
1695 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2296 return if UNIVERSAL::isa $self->map, "ext::map_link";
1696 2297
1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2298 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1698 if $self->map; 2299 if $self->map && $self->map->{path} ne "{link}";
1699 2300
1700 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2301 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1701} 2302}
1702 2303
1703sub cf::object::player::leave_link { 2304sub cf::object::player::leave_link {
1704 my ($self, $map, $x, $y) = @_; 2305 my ($self, $map, $x, $y) = @_;
2306
2307 return unless $self->contr->active;
1705 2308
1706 my $link_pos = delete $self->{_link_pos}; 2309 my $link_pos = delete $self->{_link_pos};
1707 2310
1708 unless ($map) { 2311 unless ($map) {
1709 # restore original map position 2312 # restore original map position
1727 $map->load; 2330 $map->load;
1728 $map->load_diag; 2331 $map->load_diag;
1729 2332
1730 return unless $self->contr->active; 2333 return unless $self->contr->active;
1731 $self->activate_recursive; 2334 $self->activate_recursive;
2335
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1732 $self->enter_map ($map, $x, $y); 2337 $self->enter_map ($map, $x, $y);
1733} 2338}
1734 2339
1735cf::player->attach ( 2340=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1736 on_logout => sub {
1737 my ($pl) = @_;
1738 2341
1739 # abort map switching before logout 2342Moves the player to the given map-path and coordinates by first freezing
1740 if ($pl->ob->{_link_pos}) { 2343her, loading and preparing them map, calling the provided $check callback
1741 cf::sync_job { 2344that has to return the map if sucecssful, and then unfreezes the player on
1742 $pl->ob->leave_link 2345the new (success) or old (failed) map position. In either case, $done will
1743 }; 2346be called at the end of this process.
1744 }
1745 },
1746 on_login => sub {
1747 my ($pl) = @_;
1748 2347
1749 # try to abort aborted map switching on player login :)
1750 # should happen only on crashes
1751 if ($pl->ob->{_link_pos}) {
1752 $pl->ob->enter_link;
1753 (async {
1754 # we need this sleep as the login has a concurrent enter_exit running
1755 # and this sleep increases chances of the player not ending up in scorn
1756 $pl->ob->reply (undef,
1757 "There was an internal problem at your last logout, "
1758 . "the server will try to bring you to your intended destination in a second.",
1759 cf::NDI_RED);
1760 Coro::Timer::sleep 1;
1761 $pl->ob->leave_link;
1762 })->prio (2);
1763 }
1764 },
1765);
1766
1767=item $player_object->goto ($path, $x, $y)
1768
1769=cut 2348=cut
2349
2350our $GOTOGEN;
1770 2351
1771sub cf::object::player::goto { 2352sub cf::object::player::goto {
1772 my ($self, $path, $x, $y) = @_; 2353 my ($self, $path, $x, $y, $check, $done) = @_;
2354
2355 # do generation counting so two concurrent goto's will be executed in-order
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1773 2357
1774 $self->enter_link; 2358 $self->enter_link;
1775 2359
1776 (async { 2360 (async {
2361 my $map = eval {
1777 my $map = cf::map::find $path; 2362 my $map = cf::map::find $path;
2363
2364 if ($map) {
1778 $map = $map->customise_for ($self) if $map; 2365 $map = $map->customise_for ($self);
1779 2366 $map = $check->($map) if $check && $map;
1780# warn "entering ", $map->path, " at ($x, $y)\n" 2367 } else {
1781# if $map;
1782
1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2368 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2369 }
1784 2370
2371 $map
2372 };
2373
2374 if ($@) {
2375 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2376 LOG llevError | logBacktrace, Carp::longmess $@;
2377 }
2378
2379 if ($gen == $self->{_goto_generation}) {
2380 delete $self->{_goto_generation};
1785 $self->leave_link ($map, $x, $y); 2381 $self->leave_link ($map, $x, $y);
2382 }
2383
2384 $done->() if $done;
1786 })->prio (1); 2385 })->prio (1);
1787} 2386}
1788 2387
1789=item $player_object->enter_exit ($exit_object) 2388=item $player_object->enter_exit ($exit_object)
1790 2389
1792 2391
1793sub parse_random_map_params { 2392sub parse_random_map_params {
1794 my ($spec) = @_; 2393 my ($spec) = @_;
1795 2394
1796 my $rmp = { # defaults 2395 my $rmp = { # defaults
1797 xsize => 10, 2396 xsize => (cf::rndm 15, 40),
1798 ysize => 10, 2397 ysize => (cf::rndm 15, 40),
2398 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2399 #layout => string,
1799 }; 2400 };
1800 2401
1801 for (split /\n/, $spec) { 2402 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 2403 my ($k, $v) = split /\s+/, $_, 2;
1803 2404
1807 $rmp 2408 $rmp
1808} 2409}
1809 2410
1810sub prepare_random_map { 2411sub prepare_random_map {
1811 my ($exit) = @_; 2412 my ($exit) = @_;
2413
2414 my $guard = cf::lock_acquire "exit_prepare:$exit";
1812 2415
1813 # all this does is basically replace the /! path by 2416 # all this does is basically replace the /! path by
1814 # a new random map path (?random/...) with a seed 2417 # a new random map path (?random/...) with a seed
1815 # that depends on the exit object 2418 # that depends on the exit object
1816 2419
1817 my $rmp = parse_random_map_params $exit->msg; 2420 my $rmp = parse_random_map_params $exit->msg;
1818 2421
1819 if ($exit->map) { 2422 if ($exit->map) {
1820 $rmp->{region} = $exit->map->region_name; 2423 $rmp->{region} = $exit->region->name;
1821 $rmp->{origin_map} = $exit->map->path; 2424 $rmp->{origin_map} = $exit->map->path;
1822 $rmp->{origin_x} = $exit->x; 2425 $rmp->{origin_x} = $exit->x;
1823 $rmp->{origin_y} = $exit->y; 2426 $rmp->{origin_y} = $exit->y;
1824 } 2427 }
1825 2428
1826 $rmp->{random_seed} ||= $exit->random_seed; 2429 $rmp->{random_seed} ||= $exit->random_seed;
1827 2430
1828 my $data = cf::to_json $rmp; 2431 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 2432 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta";
1830 2434
1831 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1832 aio_write $fh, 0, (length $data), $data, 0; 2436 aio_write $fh, 0, (length $data), $data, 0;
2437 undef $fh;
2438 aio_rename "$meta~", $meta;
1833 2439
1834 $exit->slaying ("?random/$md5"); 2440 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 2441 $exit->msg (undef);
1836 } 2442 }
1837} 2443}
1839sub cf::object::player::enter_exit { 2445sub cf::object::player::enter_exit {
1840 my ($self, $exit) = @_; 2446 my ($self, $exit) = @_;
1841 2447
1842 return unless $self->type == cf::PLAYER; 2448 return unless $self->type == cf::PLAYER;
1843 2449
2450 if ($exit->slaying eq "/!") {
2451 #TODO: this should de-fi-ni-te-ly not be a sync-job
2452 # the problem is that $exit might not survive long enough
2453 # so it needs to be done right now, right here
2454 cf::sync_job { prepare_random_map $exit };
2455 }
2456
2457 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2458 my $hp = $exit->stats->hp;
2459 my $sp = $exit->stats->sp;
2460
1844 $self->enter_link; 2461 $self->enter_link;
2462
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
1845 2466
1846 (async { 2467 (async {
1847 $self->deactivate_recursive; # just to be sure 2468 $self->deactivate_recursive; # just to be sure
1848 unless (eval { 2469 unless (eval {
1849 prepare_random_map $exit 2470 $self->goto ($slaying, $hp, $sp);
1850 if $exit->slaying eq "/!";
1851
1852 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1854 2471
1855 1; 2472 1;
1856 }) { 2473 }) {
1857 $self->message ("Something went wrong deep within the crossfire server. " 2474 $self->message ("Something went wrong deep within the crossfire server. "
1858 . "I'll try to bring you back to the map you were before. " 2475 . "I'll try to bring you back to the map you were before. "
1859 . "Please report this to the dungeon master!", 2476 . "Please report this to the dungeon master!",
1860 cf::NDI_UNIQUE | cf::NDI_RED); 2477 cf::NDI_UNIQUE | cf::NDI_RED);
1861 2478
1862 warn "ERROR in enter_exit: $@"; 2479 warn "ERROR in enter_exit: $@";
1863 $self->leave_link; 2480 $self->leave_link;
1864 } 2481 }
1865 })->prio (1); 2482 })->prio (1);
1878 2495
1879sub cf::client::send_drawinfo { 2496sub cf::client::send_drawinfo {
1880 my ($self, $text, $flags) = @_; 2497 my ($self, $text, $flags) = @_;
1881 2498
1882 utf8::encode $text; 2499 utf8::encode $text;
1883 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2500 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1884} 2501}
1885 2502
2503=item $client->send_msg ($channel, $msg, $color, [extra...])
2504
2505Send a drawinfo or msg packet to the client, formatting the msg for the
2506client if neccessary. C<$type> should be a string identifying the type of
2507the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet.
2509
2510=cut
2511
2512sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_;
2514
2515 $msg = $self->pl->expand_cfpod ($msg);
2516
2517 $color &= ~cf::NDI_UNIQUE; # just in case...
2518
2519 if (ref $channel) {
2520 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel);
2524 }
2525
2526 $channel = $channel->{id};
2527 }
2528
2529 return unless @extra || length $msg;
2530
2531 if ($self->can_msg) {
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2533 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) {
2545 if (0 && $msg =~ /\[/) {
2546 $self->send_packet ("drawextinfo $color 4 0 $msg")
2547 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg")
2550 }
2551 }
2552 }
2553}
2554
2555=item $client->ext_msg ($type, @msg)
2556
2557Sends an ext event to the client.
2558
2559=cut
2560
2561sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_;
2563
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type";
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 }
2572}
1886 2573
1887=item $success = $client->query ($flags, "text", \&cb) 2574=item $success = $client->query ($flags, "text", \&cb)
1888 2575
1889Queues a query to the client, calling the given callback with 2576Queues a query to the client, calling the given callback with
1890the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2577the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1891C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2578C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1892 2579
1893Queries can fail, so check the return code. Or don't, as queries will become 2580Queries can fail, so check the return code. Or don't, as queries will
1894reliable at some point in the future. 2581become reliable at some point in the future.
1895 2582
1896=cut 2583=cut
1897 2584
1898sub cf::client::query { 2585sub cf::client::query {
1899 my ($self, $flags, $text, $cb) = @_; 2586 my ($self, $flags, $text, $cb) = @_;
1907 utf8::encode $text; 2594 utf8::encode $text;
1908 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2595 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1909 2596
1910 $self->send_packet ($self->{query_queue}[0][0]) 2597 $self->send_packet ($self->{query_queue}[0][0])
1911 if @{ $self->{query_queue} } == 1; 2598 if @{ $self->{query_queue} } == 1;
2599
2600 1
1912} 2601}
1913 2602
1914cf::client->attach ( 2603cf::client->attach (
2604 on_connect => sub {
2605 my ($ns) = @_;
2606
2607 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2608 },
1915 on_reply => sub { 2609 on_reply => sub {
1916 my ($ns, $msg) = @_; 2610 my ($ns, $msg) = @_;
1917 2611
1918 # this weird shuffling is so that direct followup queries 2612 # this weird shuffling is so that direct followup queries
1919 # get handled first 2613 # get handled first
1920 my $queue = delete $ns->{query_queue} 2614 my $queue = delete $ns->{query_queue}
1921 or return; # be conservative, not sure how that can happen, but we saw a crash here 2615 or return; # be conservative, not sure how that can happen, but we saw a crash here
1922 2616
1923 (shift @$queue)->[1]->($msg); 2617 (shift @$queue)->[1]->($msg);
2618 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1924 2619
1925 push @{ $ns->{query_queue} }, @$queue; 2620 push @{ $ns->{query_queue} }, @$queue;
1926 2621
1927 if (@{ $ns->{query_queue} } == @$queue) { 2622 if (@{ $ns->{query_queue} } == @$queue) {
1928 if (@$queue) { 2623 if (@$queue) {
1930 } else { 2625 } else {
1931 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2626 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1932 } 2627 }
1933 } 2628 }
1934 }, 2629 },
2630 on_exticmd => sub {
2631 my ($ns, $buf) = @_;
2632
2633 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2634
2635 if (ref $msg) {
2636 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg
2638 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640
2641 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 }
2647 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 }
2650
2651 cf::override;
2652 },
1935); 2653);
1936 2654
1937=item $client->async (\&cb) 2655=item $client->async (\&cb)
1938 2656
1939Create a new coroutine, running the specified callback. The coroutine will 2657Create a new coroutine, running the specified callback. The coroutine will
1986 2704
1987# here we export the classes and methods available to script code 2705# here we export the classes and methods available to script code
1988 2706
1989=pod 2707=pod
1990 2708
1991The following fucntions and emthods are available within a safe environment: 2709The following functions and methods are available within a safe environment:
1992 2710
1993 cf::object contr pay_amount pay_player map 2711 cf::object
2712 contr pay_amount pay_player map x y force_find force_add
2713 insert remove
2714
1994 cf::object::player player 2715 cf::object::player
1995 cf::player peaceful 2716 player
1996 cf::map trigger 2717
2718 cf::player
2719 peaceful
2720
2721 cf::map
2722 trigger
1997 2723
1998=cut 2724=cut
1999 2725
2000for ( 2726for (
2001 ["cf::object" => qw(contr pay_amount pay_player map)], 2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove)],
2002 ["cf::object::player" => qw(player)], 2729 ["cf::object::player" => qw(player)],
2003 ["cf::player" => qw(peaceful)], 2730 ["cf::player" => qw(peaceful)],
2004 ["cf::map" => qw(trigger)], 2731 ["cf::map" => qw(trigger)],
2005) { 2732) {
2006 no strict 'refs'; 2733 no strict 'refs';
2077=back 2804=back
2078 2805
2079=cut 2806=cut
2080 2807
2081############################################################################# 2808#############################################################################
2809# the server's init and main functions
2082 2810
2083=head2 EXTENSION DATABASE SUPPORT 2811sub load_facedata($) {
2812 my ($path) = @_;
2084 2813
2085Crossfire maintains a very simple database for extension use. It can 2814 warn "loading facedata from $path\n";
2086currently store anything that can be serialised using Storable, which
2087excludes objects.
2088 2815
2089The parameter C<$family> should best start with the name of the extension 2816 my $facedata;
2090using it, it should be unique. 2817 0 < aio_load $path, $facedata
2818 or die "$path: $!";
2091 2819
2092=over 4 2820 $facedata = Coro::Storable::thaw $facedata;
2093 2821
2094=item $hashref = cf::db_get $family 2822 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed.";
2095 2824
2096Return a hashref for use by the extension C<$family>, which can be
2097modified. After modifications, you have to call C<cf::db_dirty> or
2098C<cf::db_sync>.
2099
2100=item $value = cf::db_get $family => $key
2101
2102Returns a single value from the database
2103
2104=item cf::db_put $family => $hashref
2105
2106Stores the given family hashref into the database. Updates are delayed, if
2107you want the data to be synced to disk immediately, use C<cf::db_sync>.
2108
2109=item cf::db_put $family => $key => $value
2110
2111Stores the given C<$value> in the family hash. Updates are delayed, if you
2112want the data to be synced to disk immediately, use C<cf::db_sync>.
2113
2114=item cf::db_dirty
2115
2116Marks the database as dirty, to be updated at a later time.
2117
2118=item cf::db_sync
2119
2120Immediately write the database to disk I<if it is dirty>.
2121
2122=cut
2123
2124our $DB;
2125
2126{
2127 my $path = cf::localdir . "/database.pst";
2128
2129 sub db_load() {
2130 $DB = stat $path ? Storable::retrieve $path : { };
2131 } 2825 {
2826 my $faces = $facedata->{faceinfo};
2132 2827
2133 my $pid; 2828 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2134 2834
2135 sub db_save() { 2835 cf::cede_to_tick;
2136 waitpid $pid, 0 if $pid;
2137 if (0 == ($pid = fork)) {
2138 $DB->{_meta}{version} = 1;
2139 Storable::nstore $DB, "$path~";
2140 rename "$path~", $path;
2141 cf::_exit 0 if defined $pid;
2142 }
2143 }
2144
2145 my $dirty;
2146
2147 sub db_sync() {
2148 db_save if $dirty;
2149 undef $dirty;
2150 }
2151
2152 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2153 db_sync;
2154 });
2155
2156 sub db_dirty() {
2157 $dirty = 1;
2158 $idle->start;
2159 }
2160
2161 sub db_get($;$) {
2162 @_ >= 2
2163 ? $DB->{$_[0]}{$_[1]}
2164 : ($DB->{$_[0]} ||= { })
2165 }
2166
2167 sub db_put($$;$) {
2168 if (@_ >= 3) {
2169 $DB->{$_[0]}{$_[1]} = $_[2];
2170 } else {
2171 $DB->{$_[0]} = $_[1];
2172 }
2173 db_dirty;
2174 }
2175
2176 cf::global->attach (
2177 prio => 10000,
2178 on_cleanup => sub {
2179 db_sync;
2180 }, 2836 }
2181 );
2182}
2183 2837
2184############################################################################# 2838 while (my ($face, $info) = each %$faces) {
2185# the server's main() 2839 next unless $info->{smooth};
2840 my $idx = cf::face::find $face
2841 or next;
2842 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'";
2847 }
2848
2849 cf::cede_to_tick;
2850 }
2851 }
2852
2853 {
2854 my $anims = $facedata->{animinfo};
2855
2856 while (my ($anim, $info) = each %$anims) {
2857 cf::anim::set $anim, $info->{frames}, $info->{facings};
2858 cf::cede_to_tick;
2859 }
2860
2861 cf::anim::invalidate_all; # d'oh
2862 }
2863
2864 {
2865 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871
2872 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2879
2880 if ($info->{type} & 1) {
2881 # prepend meta info
2882
2883 my $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2889 }
2890
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick;
2894 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904
2905 cf::sound::set $sound->[0] => $face;
2906 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2907 }
2908
2909 #TODO
2910 }
2911 }
2912
2913 1
2914}
2915
2916register_exticmd fx_want => sub {
2917 my ($ns, $want) = @_;
2918
2919 while (my ($k, $v) = each %$want) {
2920 $ns->fx_want ($k, $v);
2921 }
2922};
2923
2924sub reload_regions {
2925 load_resource_file "$MAPDIR/regions"
2926 or die "unable to load regions file\n";
2927
2928 for (cf::region::list) {
2929 $_->{match} = qr/$_->{match}/
2930 if exists $_->{match};
2931 }
2932}
2933
2934sub reload_facedata {
2935 load_facedata "$DATADIR/facedata"
2936 or die "unable to load facedata\n";
2937}
2938
2939sub reload_archetypes {
2940 load_resource_file "$DATADIR/archetypes"
2941 or die "unable to load archetypes\n";
2942 #d# NEED to laod twice to resolve forward references
2943 # this really needs to be done in an extra post-pass
2944 # (which needs to be synchronous, so solve it differently)
2945 load_resource_file "$DATADIR/archetypes"
2946 or die "unable to load archetypes\n";
2947}
2948
2949sub reload_treasures {
2950 load_resource_file "$DATADIR/treasures"
2951 or die "unable to load treasurelists\n";
2952}
2953
2954sub reload_resources {
2955 warn "reloading resource files...\n";
2956
2957 reload_regions;
2958 reload_facedata;
2959 #reload_archetypes;#d#
2960 reload_archetypes;
2961 reload_treasures;
2962
2963 warn "finished reloading resource files\n";
2964}
2965
2966sub init {
2967 reload_resources;
2968}
2186 2969
2187sub cfg_load { 2970sub cfg_load {
2188 open my $fh, "<:utf8", cf::confdir . "/config" 2971 open my $fh, "<:utf8", "$CONFDIR/config"
2189 or return; 2972 or return;
2190 2973
2191 local $/; 2974 local $/;
2192 *CFG = YAML::Syck::Load <$fh>; 2975 *CFG = YAML::Syck::Load <$fh>;
2193 2976
2207 2990
2208sub main { 2991sub main {
2209 # we must not ever block the main coroutine 2992 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 2993 local $Coro::idle = sub {
2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2994 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2995 (async {
2212 async { Event::one_event }; 2996 Event::one_event;
2997 })->prio (Coro::PRIO_MAX);
2213 }; 2998 };
2214 2999
2215 cfg_load; 3000 cfg_load;
2216 db_load; 3001 db_init;
2217 load_extensions; 3002 load_extensions;
3003
3004 $TICK_WATCHER->start;
2218 Event::loop; 3005 Event::loop;
2219} 3006}
2220 3007
2221############################################################################# 3008#############################################################################
2222# initialisation and cleanup 3009# initialisation and cleanup
2223 3010
2224# install some emergency cleanup handlers 3011# install some emergency cleanup handlers
2225BEGIN { 3012BEGIN {
2226 for my $signal (qw(INT HUP TERM)) { 3013 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal ( 3014 Event->signal (
3015 reentrant => 0,
2228 data => WF_AUTOCANCEL, 3016 data => WF_AUTOCANCEL,
2229 signal => $signal, 3017 signal => $signal,
3018 prio => 0,
2230 cb => sub { 3019 cb => sub {
2231 cf::cleanup "SIG$signal"; 3020 cf::cleanup "SIG$signal";
2232 }, 3021 },
2233 ); 3022 );
2234 } 3023 }
3024}
3025
3026sub write_runtime {
3027 my $runtime = "$LOCALDIR/runtime";
3028
3029 # first touch the runtime file to show we are still running:
3030 # the fsync below can take a very very long time.
3031
3032 IO::AIO::aio_utime $runtime, undef, undef;
3033
3034 my $guard = cf::lock_acquire "write_runtime";
3035
3036 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3037 or return;
3038
3039 my $value = $cf::RUNTIME + 90 + 10;
3040 # 10 is the runtime save interval, for a monotonic clock
3041 # 60 allows for the watchdog to kill the server.
3042
3043 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3044 and return;
3045
3046 # always fsync - this file is important
3047 aio_fsync $fh
3048 and return;
3049
3050 # touch it again to show we are up-to-date
3051 aio_utime $fh, undef, undef;
3052
3053 close $fh
3054 or return;
3055
3056 aio_rename "$runtime~", $runtime
3057 and return;
3058
3059 warn "runtime file written.\n";
3060
3061 1
2235} 3062}
2236 3063
2237sub emergency_save() { 3064sub emergency_save() {
2238 my $freeze_guard = cf::freeze_mainloop; 3065 my $freeze_guard = cf::freeze_mainloop;
2239 3066
2256 my $map = $cf::MAP{$path} or next; 3083 my $map = $cf::MAP{$path} or next;
2257 $map->valid or next; 3084 $map->valid or next;
2258 $map->save; 3085 $map->save;
2259 } 3086 }
2260 warn "end emergency map save\n"; 3087 warn "end emergency map save\n";
3088
3089 warn "begin emergency database checkpoint\n";
3090 BDB::db_env_txn_checkpoint $DB_ENV;
3091 warn "end emergency database checkpoint\n";
2261 }; 3092 };
2262 3093
2263 warn "leave emergency perl save\n"; 3094 warn "leave emergency perl save\n";
2264} 3095}
2265 3096
3097sub post_cleanup {
3098 my ($make_core) = @_;
3099
3100 warn Carp::longmess "post_cleanup backtrace"
3101 if $make_core;
3102}
3103
2266sub reload() { 3104sub do_reload_perl() {
2267 # can/must only be called in main 3105 # can/must only be called in main
2268 if ($Coro::current != $Coro::main) { 3106 if ($Coro::current != $Coro::main) {
2269 warn "can only reload from main coroutine\n"; 3107 warn "can only reload from main coroutine";
2270 return; 3108 return;
2271 } 3109 }
2272 3110
2273 warn "reloading..."; 3111 warn "reloading...";
2274 3112
2275 warn "freezing server"; 3113 warn "entering sync_job";
2276 my $guard = freeze_mainloop; 3114
3115 cf::sync_job {
3116 cf::write_runtime; # external watchdog should not bark
2277 cf::emergency_save; 3117 cf::emergency_save;
3118 cf::write_runtime; # external watchdog should not bark
2278 3119
2279 warn "sync database to disk"; 3120 warn "syncing database to disk";
2280 cf::db_sync; 3121 BDB::db_env_txn_checkpoint $DB_ENV;
2281 IO::AIO::flush;
2282 3122
2283 eval {
2284 # if anything goes wrong in here, we should simply crash as we already saved 3123 # if anything goes wrong in here, we should simply crash as we already saved
2285 3124
2286 warn "cancel all watchers"; 3125 warn "cancelling all WF_AUTOCANCEL watchers";
2287 for (Event::all_watchers) { 3126 for (Event::all_watchers) {
2288 $_->cancel if $_->data & WF_AUTOCANCEL; 3127 $_->cancel if $_->data & WF_AUTOCANCEL;
2289 } 3128 }
2290 3129
3130 warn "flushing outstanding aio requests";
3131 for (;;) {
3132 BDB::flush;
3133 IO::AIO::flush;
3134 Coro::cede;
3135 last unless IO::AIO::nreqs || BDB::nreqs;
3136 warn "iterate...";
3137 }
3138
3139 ++$RELOAD;
3140
2291 warn "cancel all extension coros"; 3141 warn "cancelling all extension coros";
2292 $_->cancel for values %EXT_CORO; 3142 $_->cancel for values %EXT_CORO;
2293 %EXT_CORO = (); 3143 %EXT_CORO = ();
2294 3144
2295 warn "remove commands"; 3145 warn "removing commands";
2296 %COMMAND = (); 3146 %COMMAND = ();
2297 3147
2298 warn "remove ext commands"; 3148 warn "removing ext/exti commands";
2299 %EXTCMD = (); 3149 %EXTCMD = ();
3150 %EXTICMD = ();
2300 3151
2301 warn "unload/nuke all extensions"; 3152 warn "unloading/nuking all extensions";
2302 for my $pkg (@EXTS) { 3153 for my $pkg (@EXTS) {
2303 warn "... unloading $pkg"; 3154 warn "... unloading $pkg";
2304 3155
2305 if (my $cb = $pkg->can ("unload")) { 3156 if (my $cb = $pkg->can ("unload")) {
2306 eval { 3157 eval {
2311 3162
2312 warn "... nuking $pkg"; 3163 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg; 3164 Symbol::delete_package $pkg;
2314 } 3165 }
2315 3166
2316 warn "unload all perl modules loaded from $LIBDIR"; 3167 warn "unloading all perl modules loaded from $LIBDIR";
2317 while (my ($k, $v) = each %INC) { 3168 while (my ($k, $v) = each %INC) {
2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3169 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2319 3170
2320 warn "removing <$k>"; 3171 warn "... unloading $k";
2321 delete $INC{$k}; 3172 delete $INC{$k};
2322 3173
2323 $k =~ s/\.pm$//; 3174 $k =~ s/\.pm$//;
2324 $k =~ s/\//::/g; 3175 $k =~ s/\//::/g;
2325 3176
2328 } 3179 }
2329 3180
2330 Symbol::delete_package $k; 3181 Symbol::delete_package $k;
2331 } 3182 }
2332 3183
2333 warn "get rid of safe::, as good as possible"; 3184 warn "getting rid of safe::, as good as possible";
2334 Symbol::delete_package "safe::$_" 3185 Symbol::delete_package "safe::$_"
2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3186 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2336 3187
2337 warn "unload cf.pm \"a bit\""; 3188 warn "unloading cf.pm \"a bit\"";
2338 delete $INC{"cf.pm"}; 3189 delete $INC{"cf.pm"};
3190 delete $INC{"cf/pod.pm"};
2339 3191
2340 # don't, removes xs symbols, too, 3192 # don't, removes xs symbols, too,
2341 # and global variables created in xs 3193 # and global variables created in xs
2342 #Symbol::delete_package __PACKAGE__; 3194 #Symbol::delete_package __PACKAGE__;
2343 3195
3196 warn "unload completed, starting to reload now";
3197
2344 warn "reloading cf.pm"; 3198 warn "reloading cf.pm";
2345 require cf; 3199 require cf;
2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3200 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2347 3201
2348 warn "load config and database again"; 3202 warn "loading config and database again";
2349 cf::cfg_load; 3203 cf::cfg_load;
2350 cf::db_load;
2351 3204
2352 warn "load extensions"; 3205 warn "loading extensions";
2353 cf::load_extensions; 3206 cf::load_extensions;
2354 3207
2355 warn "reattach attachments to objects/players"; 3208 warn "reattaching attachments to objects/players";
2356 _global_reattach; 3209 _global_reattach; # objects, sockets
2357 warn "reattach attachments to maps"; 3210 warn "reattaching attachments to maps";
2358 reattach $_ for values %MAP; 3211 reattach $_ for values %MAP;
2359 }; 3212 warn "reattaching attachments to players";
3213 reattach $_ for values %PLAYER;
2360 3214
2361 if ($@) { 3215 warn "leaving sync_job";
3216
3217 1
3218 } or do {
2362 warn $@; 3219 warn $@;
2363 warn "error while reloading, exiting."; 3220 warn "error while reloading, exiting.";
2364 exit 1; 3221 exit 1;
2365 } 3222 };
2366 3223
2367 warn "reloaded"; 3224 warn "reloaded";
2368}; 3225};
2369 3226
3227our $RELOAD_WATCHER; # used only during reload
3228
3229sub reload_perl() {
3230 # doing reload synchronously and two reloads happen back-to-back,
3231 # coro crashes during coro_state_free->destroy here.
3232
3233 $RELOAD_WATCHER ||= Event->timer (
3234 reentrant => 0,
3235 after => 0,
3236 data => WF_AUTOCANCEL,
3237 cb => sub {
3238 do_reload_perl;
3239 undef $RELOAD_WATCHER;
3240 },
3241 );
3242}
3243
2370register_command "reload" => sub { 3244register_command "reload" => sub {
2371 my ($who, $arg) = @_; 3245 my ($who, $arg) = @_;
2372 3246
2373 if ($who->flag (FLAG_WIZ)) { 3247 if ($who->flag (FLAG_WIZ)) {
2374 $who->message ("start of reload.");
2375 reload;
2376 $who->message ("end of reload."); 3248 $who->message ("reloading server.");
3249 async { reload_perl };
2377 } 3250 }
2378}; 3251};
2379 3252
2380unshift @INC, $LIBDIR; 3253unshift @INC, $LIBDIR;
2381 3254
3255my $bug_warning = 0;
3256
3257our @WAIT_FOR_TICK;
3258our @WAIT_FOR_TICK_BEGIN;
3259
3260sub wait_for_tick {
3261 return unless $TICK_WATCHER->is_active;
3262 return if $Coro::current == $Coro::main;
3263
3264 my $signal = new Coro::Signal;
3265 push @WAIT_FOR_TICK, $signal;
3266 $signal->wait;
3267}
3268
3269sub wait_for_tick_begin {
3270 return unless $TICK_WATCHER->is_active;
3271 return if $Coro::current == $Coro::main;
3272
3273 my $signal = new Coro::Signal;
3274 push @WAIT_FOR_TICK_BEGIN, $signal;
3275 $signal->wait;
3276}
3277
3278 my $min = 1e6;#d#
3279 my $avg = 10;
2382$TICK_WATCHER = Event->timer ( 3280$TICK_WATCHER = Event->timer (
2383 reentrant => 0, 3281 reentrant => 0,
3282 parked => 1,
2384 prio => 0, 3283 prio => 0,
2385 at => $NEXT_TICK || $TICK, 3284 at => $NEXT_TICK || $TICK,
2386 data => WF_AUTOCANCEL, 3285 data => WF_AUTOCANCEL,
2387 cb => sub { 3286 cb => sub {
3287 if ($Coro::current != $Coro::main) {
3288 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3289 unless ++$bug_warning > 10;
3290 return;
3291 }
3292
2388 $NOW = Event::time; 3293 $NOW = $tick_start = Event::time;
2389 3294
2390 cf::server_tick; # one server iteration 3295 cf::server_tick; # one server iteration
3296
3297 0 && sync_job {#d#
3298 for(1..10) {
3299 my $t = Event::time;
3300 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3301 or die;
3302
3303 $map->width (50);
3304 $map->height (50);
3305 $map->alloc;
3306 $map->_load_objects ("/tmp/x.map", 1);
3307 my $t = Event::time - $t;
3308
3309 #next unless $t < 0.0013;#d#
3310 if ($t < $min) {
3311 $min = $t;
3312 }
3313 $avg = $avg * 0.99 + $t * 0.01;
3314 }
3315 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3316 exit 0;
3317 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3318 };
3319
2391 $RUNTIME += $TICK; 3320 $RUNTIME += $TICK;
2392 $NEXT_TICK += $TICK; 3321 $NEXT_TICK += $TICK;
2393 3322
2394 $WAIT_FOR_TICK->broadcast; 3323 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2395 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3324 $NEXT_RUNTIME_WRITE = $NOW + 10;
3325 Coro::async_pool {
3326 write_runtime
3327 or warn "ERROR: unable to write runtime file: $!";
3328 };
3329 }
3330
3331# my $AFTER = Event::time;
3332# warn $AFTER - $NOW;#d#
3333
3334 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3335 $sig->send;
3336 }
3337 while (my $sig = shift @WAIT_FOR_TICK) {
3338 $sig->send;
3339 }
3340
3341 $NOW = Event::time;
2396 3342
2397 # if we are delayed by four ticks or more, skip them all 3343 # if we are delayed by four ticks or more, skip them all
2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3344 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2399 3345
2400 $TICK_WATCHER->at ($NEXT_TICK); 3346 $TICK_WATCHER->at ($NEXT_TICK);
2401 $TICK_WATCHER->start; 3347 $TICK_WATCHER->start;
3348
3349 $LOAD = ($NOW - $tick_start) / $TICK;
3350 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3351
3352 _post_tick;
3353
3354
2402 }, 3355 },
2403); 3356);
2404 3357
3358{
2405IO::AIO::max_poll_time $TICK * 0.2; 3359 BDB::max_poll_time $TICK * 0.1;
2406 3360 $BDB_POLL_WATCHER = Event->io (
2407Event->io ( 3361 reentrant => 0,
2408 fd => IO::AIO::poll_fileno, 3362 fd => BDB::poll_fileno,
2409 poll => 'r', 3363 poll => 'r',
2410 prio => 5, 3364 prio => 0,
2411 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb,
2413);
2414
2415Event->timer (
2416 data => WF_AUTOCANCEL, 3365 data => WF_AUTOCANCEL,
2417 after => 0, 3366 cb => \&BDB::poll_cb,
2418 interval => 10, 3367 );
2419 cb => sub { 3368 BDB::min_parallel 8;
2420 (Coro::unblock_sub { 3369
2421 write_runtime 3370 BDB::set_sync_prepare {
2422 or warn "ERROR: unable to write runtime file: $!"; 3371 my $status;
3372 my $current = $Coro::current;
3373 (
3374 sub {
3375 $status = $!;
3376 $current->ready; undef $current;
3377 },
3378 sub {
3379 Coro::schedule while defined $current;
3380 $! = $status;
3381 },
3382 )
3383 };
3384
3385 unless ($DB_ENV) {
3386 $DB_ENV = BDB::db_env_create;
3387
3388 cf::sync_job {
3389 eval {
3390 BDB::db_env_open
3391 $DB_ENV,
3392 $BDBDIR,
3393 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3394 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3395 0666;
3396
3397 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3398
3399 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3400 $DB_ENV->set_lk_detect;
3401 };
3402
3403 cf::cleanup "db_env_open(db): $@" if $@;
2423 })->(); 3404 };
2424 }, 3405 }
2425); 3406}
3407
3408{
3409 IO::AIO::min_parallel 8;
3410
3411 undef $Coro::AIO::WATCHER;
3412 IO::AIO::max_poll_time $TICK * 0.1;
3413 $AIO_POLL_WATCHER = Event->io (
3414 reentrant => 0,
3415 data => WF_AUTOCANCEL,
3416 fd => IO::AIO::poll_fileno,
3417 poll => 'r',
3418 prio => 6,
3419 cb => \&IO::AIO::poll_cb,
3420 );
3421}
3422
3423my $_log_backtrace;
3424
3425sub _log_backtrace {
3426 my ($msg, @addr) = @_;
3427
3428 $msg =~ s/\n//;
3429
3430 # limit the # of concurrent backtraces
3431 if ($_log_backtrace < 2) {
3432 ++$_log_backtrace;
3433 async {
3434 my @bt = fork_call {
3435 @addr = map { sprintf "%x", $_ } @addr;
3436 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3437 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3438 or die "addr2line: $!";
3439
3440 my @funcs;
3441 my @res = <$fh>;
3442 chomp for @res;
3443 while (@res) {
3444 my ($func, $line) = splice @res, 0, 2, ();
3445 push @funcs, "[$func] $line";
3446 }
3447
3448 @funcs
3449 };
3450
3451 LOG llevInfo, "[ABT] $msg\n";
3452 LOG llevInfo, "[ABT] $_\n" for @bt;
3453 --$_log_backtrace;
3454 };
3455 } else {
3456 LOG llevInfo, "[ABT] $msg\n";
3457 LOG llevInfo, "[ABT] [suppressed]\n";
3458 }
3459}
3460
3461# load additional modules
3462use cf::pod;
2426 3463
2427END { cf::emergency_save } 3464END { cf::emergency_save }
2428 3465
24291 34661
2430 3467

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines