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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines