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.238 by root, Sat Apr 14 07:23:00 2007 UTC vs.
Revision 1.358 by root, Fri Sep 7 18:10:52 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.64 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
21use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
22 25
26use JSON::XS ();
23use BDB (); 27use BDB ();
24use Data::Dumper; 28use Data::Dumper;
25use Digest::MD5; 29use Digest::MD5;
26use Fcntl; 30use Fcntl;
27use YAML::Syck (); 31use YAML::Syck ();
28use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
29use Time::HiRes; 33use Time::HiRes;
30use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
31 36
32# configure various modules to our taste 37# configure various modules to our taste
33# 38#
34$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
47our %COMMAND = (); 52our %COMMAND = ();
48our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
49 54
50our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
51our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
52our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
54 60
55our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
56our @EVENT; 62our @EVENT;
57our $LIBDIR = datadir . "/ext";
58 63
59our $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(!)
60our $TICK_WATCHER; 77our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 80our $NEXT_TICK;
64our $NOW; 81our $NOW;
70our %CFG; 87our %CFG;
71 88
72our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
73our $RUNTIME; 90our $RUNTIME;
74 91
75our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
76our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
77our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80
81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
83 95
84# 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 ∕
85our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
86 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
87binmode STDOUT; 103binmode STDOUT;
88binmode STDERR; 104binmode STDERR;
89 105
90# read virtual server time, if available 106# read virtual server time, if available
91unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
92 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
93 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
94 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
95} 111}
96 112
97mkdir cf::localdir; 113mkdir $_
98mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
99mkdir cf::localdir . "/" . cf::tmpdir;
100mkdir cf::localdir . "/" . cf::uniquedir;
101mkdir $RANDOM_MAPS;
102mkdir $BDB_ENV_DIR;
103 115
104our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
105 117
106sub cf::map::normalise; 118sub cf::map::normalise;
107 119
118=item $cf::RUNTIME 130=item $cf::RUNTIME
119 131
120The 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
121every server tick. 133every server tick.
122 134
123=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
124 138
125The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
126be 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.
127 143
128=item $cf::NOW 144=item $cf::NOW
129 145
130The time of the last (current) server tick. 146The time of the last (current) server tick.
131 147
132=item $cf::TICK 148=item $cf::TICK
133 149
134The 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.
135 161
136=item %cf::CFG 162=item %cf::CFG
137 163
138Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
139from wherever your confdir points to. 165from wherever your confdir points to.
140 166
141=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
142 168
143These 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
144or 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
145processing 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.
146window 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.
147 178
148=back 179=back
149 180
150=cut 181=cut
151 182
152BEGIN { 183BEGIN {
153 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
154 my $msg = join "", @_; 185 my $msg = join "", @_;
155 utf8::encode $msg;
156 186
157 $msg .= "\n" 187 $msg .= "\n"
158 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
159 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
160 LOG llevError, $msg; 193 LOG llevError, $msg;
161 }; 194 };
162} 195}
163 196
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
169@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
170 204
171# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
172# within the Safe compartment. 206# within the Safe compartment.
173for my $pkg (qw( 207for my $pkg (qw(
174 cf::global cf::attachable 208 cf::global cf::attachable
182} 216}
183 217
184$Event::DIED = sub { 218$Event::DIED = sub {
185 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
186}; 220};
221
222#############################################################################
187 223
188=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
189 225
190=over 4 226=over 4
191 227
210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
211 $d 247 $d
212 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
213} 249}
214 250
215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
216
217=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
218 252
219Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
220 254
221=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
222 256
223Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
224 265
225=item cf::lock_wait $string 266=item cf::lock_wait $string
226 267
227Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
228 269
231Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
232a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
233for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
234returned. 275returned.
235 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
236Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
237uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
238 282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
286
239=cut 287=cut
240 288
241our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
242 291
243sub lock_wait($) { 292sub lock_wait($) {
244 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
245 299
246 # wait for lock, if any 300 # wait for lock, if any
247 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
248 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
249 Coro::schedule; 303 Coro::schedule;
255 309
256 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
257 lock_wait $key; 311 lock_wait $key;
258 312
259 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
260 315
261 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
262 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
264 } 320 }
321}
322
323sub lock_active($) {
324 my ($key) = @_;
325
326 ! ! $LOCK{$key}
265} 327}
266 328
267sub freeze_mainloop { 329sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 330 return unless $TICK_WATCHER->is_active;
269 331
272 }; 334 };
273 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
274 $guard 336 $guard
275} 337}
276 338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
393}
394
277=item cf::async { BLOCK } 395=item cf::async { BLOCK }
278 396
279Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
280C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 398C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
281thing you are allowed to do is call C<prio> on it. 399thing you are allowed to do is call C<prio> on it.
284 402
285BEGIN { *async = \&Coro::async_pool } 403BEGIN { *async = \&Coro::async_pool }
286 404
287=item cf::sync_job { BLOCK } 405=item cf::sync_job { BLOCK }
288 406
289The design of crossfire+ requires that the main coro ($Coro::main) is 407The design of Crossfire TRT requires that the main coroutine ($Coro::main)
290always able to handle events or runnable, as crossfire+ is only partly 408is always able to handle events or runnable, as Crossfire TRT is only
291reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable.
292 411
293If it must be done, put the blocking parts into C<sync_job>. This will run 412If it must be done, put the blocking parts into C<sync_job>. This will run
294the given BLOCK in another coroutine while waiting for the result. The 413the given BLOCK in another coroutine while waiting for the result. The
295server will be frozen during this time, so the block should either finish 414server will be frozen during this time, so the block should either finish
296fast or be very important. 415fast or be very important.
299 418
300sub sync_job(&) { 419sub sync_job(&) {
301 my ($job) = @_; 420 my ($job) = @_;
302 421
303 if ($Coro::current == $Coro::main) { 422 if ($Coro::current == $Coro::main) {
423 my $time = Event::time;
424
304 # this is the main coro, too bad, we have to block 425 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 426 # till the operation succeeds, freezing the server :/
306 427
307 # TODO: use suspend/resume instead 428 # TODO: use suspend/resume instead
308 # (but this is cancel-safe) 429 # (but this is cancel-safe)
319 440
320 while ($busy) { 441 while ($busy) {
321 Coro::cede or Event::one_event; 442 Coro::cede or Event::one_event;
322 } 443 }
323 444
445 $time = Event::time - $time;
446
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load
451
324 wantarray ? @res : $res[0] 452 wantarray ? @res : $res[0]
325 } else { 453 } else {
326 # we are in another coroutine, how wonderful, everything just works 454 # we are in another coroutine, how wonderful, everything just works
327 455
328 $job->() 456 $job->()
347 $EXT_CORO{$coro+0} = $coro; 475 $EXT_CORO{$coro+0} = $coro;
348 476
349 $coro 477 $coro
350} 478}
351 479
352sub write_runtime { 480=item fork_call { }, $args
353 my $guard = cf::lock_acquire "write_runtime";
354 481
355 my $runtime = cf::localdir . "/runtime"; 482Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling.
356 486
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 487=cut
358 or return;
359 488
360 my $value = $cf::RUNTIME + 90 + 10; 489sub fork_call(&@) {
361 # 10 is the runtime save interval, for a monotonic clock 490 my ($cb, @args) = @_;
362 # 60 allows for the watchdog to kill the server.
363 491
364 (aio_write $fh, 0, (length $value), $value, 0) <= 0 492 # we seemingly have to make a local copy of the whole thing,
365 and return; 493 # otherwise perl prematurely frees the stuff :/
494 # TODO: investigate and fix (likely this will be rather laborious)
366 495
367 # always fsync - this file is important 496 my @res = Coro::Util::fork_eval {
368 aio_fsync $fh 497 reset_signals;
369 and return; 498 &$cb
499 }, @args;
370 500
371 close $fh 501 wantarray ? @res : $res[-1]
372 or return; 502}
373 503
374 aio_rename "$runtime~", $runtime 504=item $value = cf::db_get $family => $key
375 and return;
376 505
506Returns a single value from the environment database.
507
508=item cf::db_put $family => $key => $value
509
510Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512
513=cut
514
515our $DB;
516
517sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job {
522 eval {
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
377 1 531 }
532}
533
534sub db_get($$) {
535 my $key = "$_[0]/$_[1]";
536
537 cf::sync_job {
538 BDB::db_get $DB, undef, $key, my $data;
539
540 $! ? ()
541 : $data
542 }
543}
544
545sub db_put($$$) {
546 BDB::dbreq_pri 4;
547 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
548}
549
550=item cf::cache $id => [$paths...], $processversion => $process
551
552Generic caching function that returns the value of the resource $id,
553caching and regenerating as required.
554
555This function can block.
556
557=cut
558
559sub cache {
560 my ($id, $src, $processversion, $process) = @_;
561
562 my $meta =
563 join "\x00",
564 $processversion,
565 map {
566 aio_stat $_
567 and Carp::croak "$_: $!";
568
569 ($_, (stat _)[7,9])
570 } @$src;
571
572 my $dbmeta = db_get cache => "$id/meta";
573 if ($dbmeta ne $meta) {
574 # changed, we may need to process
575
576 my @data;
577 my $md5;
578
579 for (0 .. $#$src) {
580 0 <= aio_load $src->[$_], $data[$_]
581 or Carp::croak "$src->[$_]: $!";
582 }
583
584 # if processing is expensive, check
585 # checksum first
586 if (1) {
587 $md5 =
588 join "\x00",
589 $processversion,
590 map {
591 cf::cede_to_tick;
592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
593 } 0.. $#$src;
594
595
596 my $dbmd5 = db_get cache => "$id/md5";
597 if ($dbmd5 eq $md5) {
598 db_put cache => "$id/meta", $meta;
599
600 return db_get cache => "$id/data";
601 }
602 }
603
604 my $t1 = Time::HiRes::time;
605 my $data = $process->(\@data);
606 my $t2 = Time::HiRes::time;
607
608 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
609
610 db_put cache => "$id/data", $data;
611 db_put cache => "$id/md5" , $md5;
612 db_put cache => "$id/meta", $meta;
613
614 return $data;
615 }
616
617 db_get cache => "$id/data"
378} 618}
379 619
380=item cf::datalog type => key => value, ... 620=item cf::datalog type => key => value, ...
381 621
382Log a datalog packet of the given type with the given key-value pairs. 622Log a datalog packet of the given type with the given key-value pairs.
400attach callbacks/event handlers (a collection of which is called an "attachment") 640attach callbacks/event handlers (a collection of which is called an "attachment")
401to it. All such attachable objects support the following methods. 641to it. All such attachable objects support the following methods.
402 642
403In the following description, CLASS can be any of C<global>, C<object> 643In the following description, CLASS can be any of C<global>, C<object>
404C<player>, C<client> or C<map> (i.e. the attachable objects in 644C<player>, C<client> or C<map> (i.e. the attachable objects in
405crossfire+). 645Crossfire TRT).
406 646
407=over 4 647=over 4
408 648
409=item $attachable->attach ($attachment, key => $value...) 649=item $attachable->attach ($attachment, key => $value...)
410 650
573 $registry = $CB_TYPE[$object_type] ||= []; 813 $registry = $CB_TYPE[$object_type] ||= [];
574 814
575 } elsif ($type eq "subtype") { 815 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 816 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 817 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 818 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 819
580 } elsif ($type eq "package") { 820 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 821 my $pkg = shift @arg;
582 822
583 while (my ($name, $id) = each %cb_id) { 823 while (my ($name, $id) = each %cb_id) {
612 _attach $registry, $klass, @attach; 852 _attach $registry, $klass, @attach;
613 } 853 }
614 854
615 $obj->{$name} = \%arg; 855 $obj->{$name} = \%arg;
616 } else { 856 } else {
617 warn "object uses attachment '$name' that is not available, postponing.\n"; 857 warn "object uses attachment '$name' which is not available, postponing.\n";
618 } 858 }
619 859
620 $obj->{_attachment}{$name} = undef; 860 $obj->{_attachment}{$name} = undef;
621} 861}
622 862
624 if (ref $_[0]) { 864 if (ref $_[0]) {
625 _object_attach @_; 865 _object_attach @_;
626 } else { 866 } else {
627 _attach shift->_attach_registry, @_; 867 _attach shift->_attach_registry, @_;
628 } 868 }
869 _recalc_want;
629}; 870};
630 871
631# all those should be optimised 872# all those should be optimised
632sub cf::attachable::detach { 873sub cf::attachable::detach {
633 my ($obj, $name) = @_; 874 my ($obj, $name) = @_;
636 delete $obj->{_attachment}{$name}; 877 delete $obj->{_attachment}{$name};
637 reattach ($obj); 878 reattach ($obj);
638 } else { 879 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 880 Carp::croak "cannot, currently, detach class attachments";
640 } 881 }
882 _recalc_want;
641}; 883};
642 884
643sub cf::attachable::attached { 885sub cf::attachable::attached {
644 my ($obj, $name) = @_; 886 my ($obj, $name) = @_;
645 887
660 "; 902 ";
661 die if $@; 903 die if $@;
662} 904}
663 905
664our $override; 906our $override;
665our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 907our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
666 908
667sub override { 909sub override {
668 $override = 1; 910 $override = 1;
669 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
670} 912}
671 913
672sub do_invoke { 914sub do_invoke {
673 my $event = shift; 915 my $event = shift;
674 my $callbacks = shift; 916 my $callbacks = shift;
675 917
676 @invoke_results = (); 918 @INVOKE_RESULTS = ();
677 919
678 local $override; 920 local $override;
679 921
680 for (@$callbacks) { 922 for (@$callbacks) {
681 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
698 940
699Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
700 942
701This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 943This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
702removed in future versions), and there is no public API to access override 944removed in future versions), and there is no public API to access override
703results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
704 946
705=back 947=back
706 948
707=cut 949=cut
708 950
709############################################################################# 951#############################################################################
710# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
711 964
712sub reattach { 965sub reattach {
713 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
714 my ($obj) = @_; 967 my ($obj) = @_;
715 968
759 }, 1012 },
760); 1013);
761 1014
762sub object_freezer_save { 1015sub object_freezer_save {
763 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
764 1019
765 sync_job { 1020 sync_job {
766 if (length $$rdata) { 1021 if (length $$rdata) {
767 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
768 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
792 } 1047 }
793 } else { 1048 } else {
794 aio_unlink $filename; 1049 aio_unlink $filename;
795 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
796 } 1051 }
797 } 1052 };
1053
1054 undef $guard;
798} 1055}
799 1056
800sub object_freezer_as_string { 1057sub object_freezer_as_string {
801 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
802 1059
807 1064
808sub object_thawer_load { 1065sub object_thawer_load {
809 my ($filename) = @_; 1066 my ($filename) = @_;
810 1067
811 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
812 1071
813 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
814 or return; 1073 or return;
815 1074
816 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
817 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
818 or return; 1077 or return;
1078
1079 undef $guard;
819 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
820 } 1081 }
821 1082
822 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
823 $filename, length $data, scalar @{$av || []};#d# 1084 $filename, length $data, scalar @{$av || []};
1085
824 return ($data, $av); 1086 ($data, $av)
825} 1087}
1088
1089=head2 COMMAND CALLBACKS
1090
1091=over 4
1092
1093=cut
826 1094
827############################################################################# 1095#############################################################################
828# command handling &c 1096# command handling &c
829 1097
830=item cf::register_command $name => \&callback($ob,$args); 1098=item cf::register_command $name => \&callback($ob,$args);
843 push @{ $COMMAND{$name} }, [$caller, $cb]; 1111 push @{ $COMMAND{$name} }, [$caller, $cb];
844} 1112}
845 1113
846=item cf::register_extcmd $name => \&callback($pl,$packet); 1114=item cf::register_extcmd $name => \&callback($pl,$packet);
847 1115
848Register a callbackf ro execution when the client sends an extcmd packet. 1116Register a callback for execution when the client sends an (synchronous)
1117extcmd packet. Ext commands will be processed in the order they are
1118received by the server, like other user commands. The first argument is
1119the logged-in player. Ext commands can only be processed after a player
1120has logged in successfully.
849 1121
850If the callback returns something, it is sent back as if reply was being 1122If the callback returns something, it is sent back as if reply was being
851called. 1123called.
852 1124
1125=item cf::register_exticmd $name => \&callback($ns,$packet);
1126
1127Register a callback for execution when the client sends an (asynchronous)
1128exticmd packet. Exti commands are processed by the server as soon as they
1129are received, i.e. out of order w.r.t. other commands. The first argument
1130is a client socket. Exti commands can be received anytime, even before
1131log-in.
1132
1133If the callback returns something, it is sent back as if reply was being
1134called.
1135
853=cut 1136=cut
854 1137
855sub register_extcmd { 1138sub register_extcmd {
856 my ($name, $cb) = @_; 1139 my ($name, $cb) = @_;
857 1140
858 $EXTCMD{$name} = $cb; 1141 $EXTCMD{$name} = $cb;
1142}
1143
1144sub register_exticmd {
1145 my ($name, $cb) = @_;
1146
1147 $EXTICMD{$name} = $cb;
859} 1148}
860 1149
861cf::player->attach ( 1150cf::player->attach (
862 on_command => sub { 1151 on_command => sub {
863 my ($pl, $name, $params) = @_; 1152 my ($pl, $name, $params) = @_;
872 cf::override; 1161 cf::override;
873 }, 1162 },
874 on_extcmd => sub { 1163 on_extcmd => sub {
875 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
876 1165
877 my $msg = eval { from_json $buf }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
878 1167
879 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
880 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
881 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
882 $pl->ext_reply ($msg->{msgid}, %reply);
883 }
884 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
885 } else { 1183 } else {
886 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
887 } 1185 }
888 1186
889 cf::override; 1187 cf::override;
890 }, 1188 },
891); 1189);
892 1190
893sub load_extension {
894 my ($path) = @_;
895
896 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
897 my $base = $1;
898 my $pkg = $1;
899 $pkg =~ s/[^[:word:]]/_/g;
900 $pkg = "ext::$pkg";
901
902 warn "... loading '$path' into '$pkg'\n";
903
904 open my $fh, "<:utf8", $path
905 or die "$path: $!";
906
907 my $source =
908 "package $pkg; use strict; use utf8;\n"
909 . "#line 1 \"$path\"\n{\n"
910 . (do { local $/; <$fh> })
911 . "\n};\n1";
912
913 unless (eval $source) {
914 my $msg = $@ ? "$path: $@\n"
915 : "extension disabled.\n";
916 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
917 warn $@;
918 warn "mandatory extension failed to load, exiting.\n";
919 exit 1;
920 }
921 die $@;
922 }
923
924 push @EXTS, $pkg;
925}
926
927sub load_extensions { 1191sub load_extensions {
1192 cf::sync_job {
1193 my %todo;
1194
928 for my $ext (<$LIBDIR/*.ext>) { 1195 for my $path (<$LIBDIR/*.ext>) {
929 next unless -r $ext; 1196 next unless -r $path;
930 eval { 1197
931 load_extension $ext; 1198 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1199 my $base = $1;
1200 my $pkg = $1;
1201 $pkg =~ s/[^[:word:]]/_/g;
1202 $pkg = "ext::$pkg";
1203
1204 open my $fh, "<:utf8", $path
1205 or die "$path: $!";
1206
1207 my $source = do { local $/; <$fh> };
1208
1209 my %ext = (
1210 path => $path,
1211 base => $base,
1212 pkg => $pkg,
1213 );
1214
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217
1218 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n"
1221 . $source
1222 . "\n};\n1";
1223
1224 $todo{$base} = \%ext;
1225 }
1226
1227 my %done;
1228 while (%todo) {
1229 my $progress;
1230
1231 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip
1234 unless exists $done{$_};
1235 }
1236
1237 warn "... loading '$k' into '$v->{pkg}'\n";
1238
1239 unless (eval $v->{source}) {
1240 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n";
1242
1243 if (exists $v->{meta}{mandatory}) {
1244 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n";
1246 exit 1;
1247 }
1248
1249 warn $msg;
1250 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
932 1 1255 }
933 } or warn "$ext not loaded: $@"; 1256
1257 skip:
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1259 unless $progress;
1260 }
934 } 1261 };
935} 1262}
936 1263
937############################################################################# 1264#############################################################################
938 1265
1266=back
1267
939=head2 CORE EXTENSIONS 1268=head2 CORE EXTENSIONS
940 1269
941Functions and methods that extend core crossfire objects. 1270Functions and methods that extend core crossfire objects.
942 1271
943=cut 1272=cut
955Returns the given player object, loading it if necessary (might block). 1284Returns the given player object, loading it if necessary (might block).
956 1285
957=cut 1286=cut
958 1287
959sub playerdir($) { 1288sub playerdir($) {
960 cf::localdir 1289 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1290 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1291}
966 1292
967sub path($) { 1293sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1294 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
995 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
996 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
997 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
998 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
999 1325
1000 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1001 or return; 1327 or return;
1328
1329 $f->next;
1330 my $pl = cf::player::load_pl $f
1331 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs;
1002 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1003 } 1335 }
1004 } 1336 }
1005} 1337}
1006 1338
1016 1348
1017 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1018 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1019 1351
1020 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1021 Coro::cede; 1353 cf::cede_to_tick;
1022} 1354}
1023 1355
1024sub new($) { 1356sub new($) {
1025 my ($login) = @_; 1357 my ($login) = @_;
1026 1358
1030 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1031 1363
1032 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1033 1365
1034 $self 1366 $self
1367}
1368
1369=item $player->send_msg ($channel, $msg, $color, [extra...])
1370
1371=cut
1372
1373sub send_msg {
1374 my $ns = shift->ns
1375 or return;
1376 $ns->send_msg (@_);
1035} 1377}
1036 1378
1037=item $pl->quit_character 1379=item $pl->quit_character
1038 1380
1039Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
1088while and may block, so not sync_job-capable, ever. 1430while and may block, so not sync_job-capable, ever.
1089 1431
1090=cut 1432=cut
1091 1433
1092sub list_logins { 1434sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1435 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1436 or return [];
1095 1437
1096 my @logins; 1438 my @logins;
1097 1439
1098 for my $login (@$dirs) { 1440 for my $login (@$dirs) {
1441 my $path = path $login;
1442
1443 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") {
1099 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1100 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1101 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1102 1449
1103 utf8::decode $login; 1450 utf8::decode $login;
1104 push @logins, $login; 1451 push @logins, $login;
1105 } 1452 }
1106 1453
1133 } 1480 }
1134 1481
1135 \@paths 1482 \@paths
1136} 1483}
1137 1484
1485=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1486
1487Expand crossfire pod fragments into protocol xml.
1488
1489=cut
1490
1491sub expand_cfpod {
1492 ((my $self), (local $_)) = @_;
1493
1494 # escape & and <
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497
1498 # this is buggy, it needs to properly take care of nested <'s
1499
1500 1 while
1501 # replace B<>, I<>, U<> etc.
1502 s/B<([^\>]*)>/<b>$1<\/b>/
1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1506 # replace G<male|female> tags
1507 || s{G<([^>|]*)\|([^>]*)>}{
1508 $self->gender ? $2 : $1
1509 }ge
1510 # replace H<hint text>
1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1518
1519 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529}
1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535
1138=item $player->ext_reply ($msgid, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1139 1537
1140Sends an ext reply to the player. 1538Sends an ext reply to the player.
1141 1539
1142=cut 1540=cut
1143 1541
1144sub ext_reply($$%) { 1542sub ext_reply($$@) {
1145 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1146 1544
1147 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1148
1149 $self->send ("ext " . cf::to_json \%msg);
1150} 1546}
1151 1547
1152=item $player->ext_event ($type, %msg) 1548=item $player->ext_msg ($type, @msg)
1153 1549
1154Sends an ext event to the client. 1550Sends an ext event to the client.
1155 1551
1156=cut 1552=cut
1157 1553
1158sub ext_event($$%) { 1554sub ext_msg($$@) {
1159 my ($self, $type, %msg) = @_; 1555 my ($self, $type, @msg) = @_;
1160 1556
1161 $self->ns->ext_event ($type, %msg); 1557 $self->ns->ext_msg ($type, @msg);
1162} 1558}
1163 1559
1164=head3 cf::region 1560=head3 cf::region
1165 1561
1166=over 4 1562=over 4
1169 1565
1170package cf::region; 1566package cf::region;
1171 1567
1172=item cf::region::find_by_path $path 1568=item cf::region::find_by_path $path
1173 1569
1174Tries to decuce the probable region for a map knowing only its path. 1570Tries to decuce the likely region for a map knowing only its path.
1175 1571
1176=cut 1572=cut
1177 1573
1178sub find_by_path($) { 1574sub find_by_path($) {
1179 my ($path) = @_; 1575 my ($path) = @_;
1180 1576
1181 my ($match, $specificity); 1577 my ($match, $specificity);
1182 1578
1183 for my $region (list) { 1579 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) { 1580 if ($region->{match} && $path =~ $region->{match}) {
1185 ($match, $specificity) = ($region, $region->specificity) 1581 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity; 1582 if $region->specificity > $specificity;
1187 } 1583 }
1188 } 1584 }
1189 1585
1253 my ($self, $merge) = @_; 1649 my ($self, $merge) = @_;
1254 1650
1255 # we have to keep some variables in memory intact 1651 # we have to keep some variables in memory intact
1256 local $self->{path}; 1652 local $self->{path};
1257 local $self->{load_path}; 1653 local $self->{load_path};
1258 local $self->{deny_save};
1259 local $self->{deny_reset};
1260 1654
1261 $self->SUPER::thawer_merge ($merge); 1655 $self->SUPER::thawer_merge ($merge);
1262} 1656}
1263 1657
1264sub normalise { 1658sub normalise {
1311 $self->init; # pass $1 etc. 1705 $self->init; # pass $1 etc.
1312 return $self; 1706 return $self;
1313 } 1707 }
1314 } 1708 }
1315 1709
1316 Carp::carp "unable to resolve path '$path' (base '$base')."; 1710 Carp::cluck "unable to resolve path '$path' (base '$base').";
1317 () 1711 ()
1318} 1712}
1319 1713
1320sub init { 1714sub init {
1321 my ($self) = @_; 1715 my ($self) = @_;
1336 1730
1337# the original (read-only) location 1731# the original (read-only) location
1338sub load_path { 1732sub load_path {
1339 my ($self) = @_; 1733 my ($self) = @_;
1340 1734
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1735 "$MAPDIR/$self->{path}.map"
1342} 1736}
1343 1737
1344# the temporary/swap location 1738# the temporary/swap location
1345sub save_path { 1739sub save_path {
1346 my ($self) = @_; 1740 my ($self) = @_;
1347 1741
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1743 "$TMPDIR/$path.map"
1350} 1744}
1351 1745
1352# the unique path, undef == no special unique path 1746# the unique path, undef == no special unique path
1353sub uniq_path { 1747sub uniq_path {
1354 my ($self) = @_; 1748 my ($self) = @_;
1355 1749
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1751 "$UNIQUEDIR/$path"
1358} 1752}
1359 1753
1360# and all this just because we cannot iterate over 1754# and all this just because we cannot iterate over
1361# all maps in C++... 1755# all maps in C++...
1362sub change_all_map_light { 1756sub change_all_map_light {
1364 1758
1365 $_->change_map_light ($change) 1759 $_->change_map_light ($change)
1366 for grep $_->outdoor, values %cf::MAP; 1760 for grep $_->outdoor, values %cf::MAP;
1367} 1761}
1368 1762
1763sub decay_objects {
1764 my ($self) = @_;
1765
1766 return if $self->{deny_reset};
1767
1768 $self->do_decay_objects;
1769}
1770
1369sub unlink_save { 1771sub unlink_save {
1370 my ($self) = @_; 1772 my ($self) = @_;
1371 1773
1372 utf8::encode (my $save = $self->save_path); 1774 utf8::encode (my $save = $self->save_path);
1373 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1775 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1376 1778
1377sub load_header_from($) { 1779sub load_header_from($) {
1378 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1379 1781
1380 utf8::encode $path; 1782 utf8::encode $path;
1381 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1382 # or return;
1383
1384 $self->_load_header ($path)
1385 or return; 1784 or return;
1785
1786 $self->_load_header ($f)
1787 or return;
1788
1789 local $MAP_LOADING{$self->{path}} = $self;
1790 $f->resolve_delayed_derefs;
1386 1791
1387 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1388 1793
1389 1 1794 1
1390} 1795}
1429 $self->load_header_orig 1834 $self->load_header_orig
1430 or return; 1835 or return;
1431 $self->prepare_orig; 1836 $self->prepare_orig;
1432 } 1837 }
1433 1838
1839 $self->{deny_reset} = 1
1840 if $self->no_reset;
1841
1434 $self->default_region (cf::region::find_by_path $self->{path}) 1842 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region; 1843 unless $self->default_region;
1436 1844
1437 1 1845 1
1438} 1846}
1441sub find { 1849sub find {
1442 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1443 1851
1444 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1445 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1446 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1447 1856
1448 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1449 my $guard = cf::lock_acquire "map_find:$path"; 1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1450 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1451 or return; 1862 or return;
1452 1863
1453 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1454 1865
1455 $map->load_header 1866 $map->load_header
1456 or return; 1867 or return;
1457 1868
1458 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1459 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1460 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1461 $map->reset; 1874 $map->reset;
1462 undef $guard;
1463 return find $path; 1875 return find $path;
1464 } 1876 }
1465 1877
1466 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1467 } 1879 }
1474 my ($self) = @_; 1886 my ($self) = @_;
1475 1887
1476 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1477 1889
1478 my $path = $self->{path}; 1890 my $path = $self->{path};
1891
1892 {
1479 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1480 1894
1895 return unless $self->valid;
1481 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1482 1897
1483 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1484 1899
1485 $self->alloc; 1900 $self->alloc;
1486 1901
1487 $self->pre_load; 1902 $self->pre_load;
1903 cf::cede_to_tick;
1488 1904
1489 $self->_load_objects ($self->{load_path}, 1) 1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1907 $self->_load_objects ($f)
1490 or return; 1908 or return;
1491 1909
1492 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1493 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1494 1912
1495 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1496 utf8::encode $uniq; 1914 utf8::encode $uniq;
1497 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1498 $self->clear_unique_items; 1917 $self->clear_unique_items;
1499 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1500 } 1921 }
1501 } 1922 }
1502 1923
1503 Coro::cede; 1924 $f->resolve_delayed_derefs;
1504 1925
1926 cf::cede_to_tick;
1505 # now do the right thing for maps 1927 # now do the right thing for maps
1506 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1507
1508 unless ($self->{deny_activate}) {
1509 $self->decay_objects;
1510 $self->fix_auto_apply;
1511 $self->update_buttons;
1512 Coro::cede;
1513 $self->set_darkness_map;
1514 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1515 unless $self->difficulty; 1930 unless $self->difficulty;
1516 Coro::cede; 1931 cf::cede_to_tick;
1932
1933 unless ($self->{deny_activate}) {
1934 $self->decay_objects;
1935 $self->fix_auto_apply;
1936 $self->update_buttons;
1937 cf::cede_to_tick;
1938 $self->set_darkness_map;
1939 cf::cede_to_tick;
1517 $self->activate; 1940 $self->activate;
1941 }
1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1945
1946 $self->in_memory (cf::MAP_IN_MEMORY);
1518 } 1947 }
1519 1948
1520 $self->post_load; 1949 $self->post_load;
1521
1522 $self->in_memory (cf::MAP_IN_MEMORY);
1523} 1950}
1524 1951
1525sub customise_for { 1952sub customise_for {
1526 my ($self, $ob) = @_; 1953 my ($self, $ob) = @_;
1527 1954
1528 return find "~" . $ob->name . "/" . $self->{path} 1955 return find "~" . $ob->name . "/" . $self->{path}
1529 if $self->per_player; 1956 if $self->per_player;
1530 1957
1958# return find "?party/" . $ob->name . "/" . $self->{path}
1959# if $self->per_party;
1960
1531 $self 1961 $self
1532} 1962}
1533 1963
1534# find and load all maps in the 3x3 area around a map 1964# find and load all maps in the 3x3 area around a map
1535sub load_diag { 1965sub load_neighbours {
1536 my ($map) = @_; 1966 my ($map) = @_;
1537 1967
1538 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1539 1969
1540 for (0 .. 3) { 1970 for (0 .. 3) {
1541 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1542 or next; 1972 or next;
1543 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1544 or next; 1974 or next;
1545 $neigh->load; 1975 $neigh->load;
1546 1976
1977 push @neigh,
1547 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1548 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1549 } 1980 }
1550 1981
1551 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1552 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1553 or next; 1985 or next;
1554 $neigh->load; 1986 $neigh->load;
1555 } 1987 }
1556} 1988}
1557 1989
1562} 1994}
1563 1995
1564sub do_load_sync { 1996sub do_load_sync {
1565 my ($map) = @_; 1997 my ($map) = @_;
1566 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1567 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1568} 2003}
1569 2004
1570our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1571our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1572 2007
1573sub find_async { 2008sub find_async {
1574 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1575 2010
1576 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1577 2012
1578 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1579 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1580 } 2015 }
1581 2016
1582 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1583 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1584 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1585 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1586 my $map = find $path 2022 if (my $map = find $k) {
1587 or next;
1588 $map->load; 2023 $map->load if $v;
2024 }
1589 2025
1590 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1591 } 2027 }
1592 } 2028 }
1593 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1594 }; 2030 };
1595 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
1598} 2034}
1599 2035
1600sub save { 2036sub save {
1601 my ($self) = @_; 2037 my ($self) = @_;
1602 2038
1603 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1604 2040
1605 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1606 2042
1607 return unless $self->dirty; 2043 return unless $self->dirty;
1608 2044
1631 my ($self) = @_; 2067 my ($self) = @_;
1632 2068
1633 # save first because save cedes 2069 # save first because save cedes
1634 $self->save; 2070 $self->save;
1635 2071
1636 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
1637 2073
1638 return if $self->players; 2074 return if $self->players;
1639 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
1640 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1641 2077
2078 $self->deactivate;
1642 $self->clear; 2079 $self->clear;
1643 $self->in_memory (cf::MAP_SWAPPED); 2080 $self->in_memory (cf::MAP_SWAPPED);
1644} 2081}
1645 2082
1646sub reset_at { 2083sub reset_at {
1647 my ($self) = @_; 2084 my ($self) = @_;
1648 2085
1649 # TODO: safety, remove and allow resettable per-player maps 2086 # TODO: safety, remove and allow resettable per-player maps
1650 return 1e99 if $self->isa ("ext::map_per_player");#d#
1651 return 1e99 if $self->{deny_reset}; 2087 return 1e99 if $self->{deny_reset};
1652 2088
1653 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2089 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1654 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2090 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1655 2091
1666 my ($self) = @_; 2102 my ($self) = @_;
1667 2103
1668 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
1669 2105
1670 return if $self->players; 2106 return if $self->players;
1671 return if $self->isa ("ext::map_per_player");#d#
1672 2107
1673 warn "resetting map ", $self->path;#d# 2108 warn "resetting map ", $self->path;
1674 2109
1675 $self->in_memory (cf::MAP_SWAPPED); 2110 $self->in_memory (cf::MAP_SWAPPED);
1676 2111
1677 # need to save uniques path 2112 # need to save uniques path
1678 unless ($self->{deny_save}) { 2113 unless ($self->{deny_save}) {
1682 if $uniq; 2117 if $uniq;
1683 } 2118 }
1684 2119
1685 delete $cf::MAP{$self->path}; 2120 delete $cf::MAP{$self->path};
1686 2121
2122 $self->deactivate;
1687 $self->clear; 2123 $self->clear;
1688 2124
1689 $_->clear_links_to ($self) for values %cf::MAP; 2125 $_->clear_links_to ($self) for values %cf::MAP;
1690 2126
1691 $self->unlink_save; 2127 $self->unlink_save;
1695my $nuke_counter = "aaaa"; 2131my $nuke_counter = "aaaa";
1696 2132
1697sub nuke { 2133sub nuke {
1698 my ($self) = @_; 2134 my ($self) = @_;
1699 2135
2136 {
2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138
1700 delete $cf::MAP{$self->path}; 2139 delete $cf::MAP{$self->path};
1701 2140
1702 $self->unlink_save; 2141 $self->unlink_save;
1703 2142
1704 bless $self, "cf::map"; 2143 bless $self, "cf::map";
1705 delete $self->{deny_reset}; 2144 delete $self->{deny_reset};
1706 $self->{deny_save} = 1; 2145 $self->{deny_save} = 1;
1707 $self->reset_timeout (1); 2146 $self->reset_timeout (1);
1708 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2147 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1709 2148
1710 $cf::MAP{$self->path} = $self; 2149 $cf::MAP{$self->path} = $self;
2150 }
1711 2151
1712 $self->reset; # polite request, might not happen 2152 $self->reset; # polite request, might not happen
2153}
2154
2155=item $maps = cf::map::tmp_maps
2156
2157Returns an arrayref with all map paths of currently instantiated and saved
2158maps. May block.
2159
2160=cut
2161
2162sub tmp_maps() {
2163 [
2164 map {
2165 utf8::decode $_;
2166 /\.map$/
2167 ? normalise $_
2168 : ()
2169 } @{ aio_readdir $TMPDIR or [] }
2170 ]
2171}
2172
2173=item $maps = cf::map::random_maps
2174
2175Returns an arrayref with all map paths of currently instantiated and saved
2176random maps. May block.
2177
2178=cut
2179
2180sub random_maps() {
2181 [
2182 map {
2183 utf8::decode $_;
2184 /\.map$/
2185 ? normalise "?random/$_"
2186 : ()
2187 } @{ aio_readdir $RANDOMDIR or [] }
2188 ]
1713} 2189}
1714 2190
1715=item cf::map::unique_maps 2191=item cf::map::unique_maps
1716 2192
1717Returns an arrayref of paths of all shared maps that have 2193Returns an arrayref of paths of all shared maps that have
1718instantiated unique items. May block. 2194instantiated unique items. May block.
1719 2195
1720=cut 2196=cut
1721 2197
1722sub unique_maps() { 2198sub unique_maps() {
1723 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2199 [
1724 or return; 2200 map {
1725
1726 my @paths;
1727
1728 for (@$files) {
1729 utf8::decode $_; 2201 utf8::decode $_;
1730 next if /\.pst$/; 2202 /\.map$/
1731 next unless /^$PATH_SEP/o; 2203 ? normalise $_
1732 2204 : ()
1733 push @paths, cf::map::normalise $_; 2205 } @{ aio_readdir $UNIQUEDIR or [] }
1734 } 2206 ]
1735
1736 \@paths
1737} 2207}
1738 2208
1739package cf; 2209package cf;
1740 2210
1741=back 2211=back
1759 map { $_, inv_recursive_ $_->inv } @_ 2229 map { $_, inv_recursive_ $_->inv } @_
1760} 2230}
1761 2231
1762sub inv_recursive { 2232sub inv_recursive {
1763 inv_recursive_ inv $_[0] 2233 inv_recursive_ inv $_[0]
2234}
2235
2236=item $ref = $ob->ref
2237
2238creates and returns a persistent reference to an objetc that can be stored as a string.
2239
2240=item $ob = cf::object::deref ($refstring)
2241
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block.
2244
2245=cut
2246
2247sub deref {
2248 my ($ref) = @_;
2249
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return;
2257 $pl->ob->uuid eq $uuid
2258 or return;
2259
2260 $pl->ob
2261 } else {
2262 warn "$ref: cannot resolve object reference\n";
2263 undef
2264 }
1764} 2265}
1765 2266
1766package cf; 2267package cf;
1767 2268
1768=back 2269=back
1787 2288
1788 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2289 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1789 2290
1790 if ($self->{record_replies}) { 2291 if ($self->{record_replies}) {
1791 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2292 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2293
1792 } else { 2294 } else {
2295 my $pl = $self->contr;
2296
2297 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2298 my $dialog = $pl->{npc_dialog};
2299 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2300
2301 } else {
1793 $msg = $npc->name . " says: $msg" if $npc; 2302 $msg = $npc->name . " says: $msg" if $npc;
1794 $self->message ($msg, $flags); 2303 $self->message ($msg, $flags);
2304 }
1795 } 2305 }
2306}
2307
2308=item $object->send_msg ($channel, $msg, $color, [extra...])
2309
2310=cut
2311
2312sub cf::object::send_msg {
2313 my $pl = shift->contr
2314 or return;
2315 $pl->send_msg (@_);
1796} 2316}
1797 2317
1798=item $player_object->may ("access") 2318=item $player_object->may ("access")
1799 2319
1800Returns wether the given player is authorized to access resource "access" 2320Returns wether the given player is authorized to access resource "access"
1847 $self->deactivate_recursive; 2367 $self->deactivate_recursive;
1848 2368
1849 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2369 return if UNIVERSAL::isa $self->map, "ext::map_link";
1850 2370
1851 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2371 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1852 if $self->map; 2372 if $self->map && $self->map->{path} ne "{link}";
1853 2373
1854 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2374 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1855} 2375}
1856 2376
1857sub cf::object::player::leave_link { 2377sub cf::object::player::leave_link {
1858 my ($self, $map, $x, $y) = @_; 2378 my ($self, $map, $x, $y) = @_;
2379
2380 return unless $self->contr->active;
1859 2381
1860 my $link_pos = delete $self->{_link_pos}; 2382 my $link_pos = delete $self->{_link_pos};
1861 2383
1862 unless ($map) { 2384 unless ($map) {
1863 # restore original map position 2385 # restore original map position
1877 # use -1 or undef as default coordinates, not 0, 0 2399 # use -1 or undef as default coordinates, not 0, 0
1878 ($x, $y) = ($map->enter_x, $map->enter_y) 2400 ($x, $y) = ($map->enter_x, $map->enter_y)
1879 if $x <=0 && $y <= 0; 2401 if $x <=0 && $y <= 0;
1880 2402
1881 $map->load; 2403 $map->load;
1882 $map->load_diag; 2404 $map->load_neighbours;
1883 2405
1884 return unless $self->contr->active; 2406 return unless $self->contr->active;
1885 $self->activate_recursive; 2407 $self->activate_recursive;
1886 2408
1887 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2409 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1888 $self->enter_map ($map, $x, $y); 2410 $self->enter_map ($map, $x, $y);
1889} 2411}
1890 2412
1891cf::player->attach ( 2413=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1892 on_logout => sub {
1893 my ($pl) = @_;
1894 2414
1895 # abort map switching before logout 2415Moves the player to the given map-path and coordinates by first freezing
1896 if ($pl->ob->{_link_pos}) { 2416her, loading and preparing them map, calling the provided $check callback
1897 cf::sync_job { 2417that has to return the map if sucecssful, and then unfreezes the player on
1898 $pl->ob->leave_link 2418the new (success) or old (failed) map position. In either case, $done will
1899 }; 2419be called at the end of this process.
1900 }
1901 },
1902 on_login => sub {
1903 my ($pl) = @_;
1904 2420
1905 # try to abort aborted map switching on player login :)
1906 # should happen only on crashes
1907 if ($pl->ob->{_link_pos}) {
1908 $pl->ob->enter_link;
1909 (async {
1910 $pl->ob->reply (undef,
1911 "There was an internal problem at your last logout, "
1912 . "the server will try to bring you to your intended destination in a second.",
1913 cf::NDI_RED);
1914 # we need this sleep as the login has a concurrent enter_exit running
1915 # and this sleep increases chances of the player not ending up in scorn
1916 Coro::Timer::sleep 1;
1917 $pl->ob->leave_link;
1918 })->prio (2);
1919 }
1920 },
1921);
1922
1923=item $player_object->goto ($path, $x, $y)
1924
1925=cut 2421=cut
2422
2423our $GOTOGEN;
1926 2424
1927sub cf::object::player::goto { 2425sub cf::object::player::goto {
1928 my ($self, $path, $x, $y) = @_; 2426 my ($self, $path, $x, $y, $check, $done) = @_;
2427
2428 # do generation counting so two concurrent goto's will be executed in-order
2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1929 2430
1930 $self->enter_link; 2431 $self->enter_link;
1931 2432
1932 (async { 2433 (async {
1933 my $map = eval { 2434 my $map = eval {
1934 my $map = cf::map::find $path; 2435 my $map = cf::map::find $path;
2436
2437 if ($map) {
1935 $map = $map->customise_for ($self) if $map; 2438 $map = $map->customise_for ($self);
2439 $map = $check->($map) if $check && $map;
2440 } else {
2441 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2442 }
2443
1936 $map 2444 $map
2445 };
2446
2447 if ($@) {
2448 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2449 LOG llevError | logBacktrace, Carp::longmess $@;
1937 } or 2450 }
1938 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1939 2451
2452 if ($gen == $self->{_goto_generation}) {
2453 delete $self->{_goto_generation};
1940 $self->leave_link ($map, $x, $y); 2454 $self->leave_link ($map, $x, $y);
2455 }
2456
2457 $done->() if $done;
1941 })->prio (1); 2458 })->prio (1);
1942} 2459}
1943 2460
1944=item $player_object->enter_exit ($exit_object) 2461=item $player_object->enter_exit ($exit_object)
1945 2462
1984 2501
1985 $rmp->{random_seed} ||= $exit->random_seed; 2502 $rmp->{random_seed} ||= $exit->random_seed;
1986 2503
1987 my $data = cf::to_json $rmp; 2504 my $data = cf::to_json $rmp;
1988 my $md5 = Digest::MD5::md5_hex $data; 2505 my $md5 = Digest::MD5::md5_hex $data;
1989 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2506 my $meta = "$RANDOMDIR/$md5.meta";
1990 2507
1991 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2508 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1992 aio_write $fh, 0, (length $data), $data, 0; 2509 aio_write $fh, 0, (length $data), $data, 0;
1993 undef $fh; 2510 undef $fh;
1994 aio_rename "$meta~", $meta; 2511 aio_rename "$meta~", $meta;
2013 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2530 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2014 my $hp = $exit->stats->hp; 2531 my $hp = $exit->stats->hp;
2015 my $sp = $exit->stats->sp; 2532 my $sp = $exit->stats->sp;
2016 2533
2017 $self->enter_link; 2534 $self->enter_link;
2535
2536 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED);
2018 2539
2019 (async { 2540 (async {
2020 $self->deactivate_recursive; # just to be sure 2541 $self->deactivate_recursive; # just to be sure
2021 unless (eval { 2542 unless (eval {
2022 $self->goto ($slaying, $hp, $sp); 2543 $self->goto ($slaying, $hp, $sp);
2050 2571
2051 utf8::encode $text; 2572 utf8::encode $text;
2052 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2573 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2053} 2574}
2054 2575
2576=item $client->send_msg ($channel, $msg, $color, [extra...])
2577
2578Send a drawinfo or msg packet to the client, formatting the msg for the
2579client if neccessary. C<$type> should be a string identifying the type of
2580the message, with C<log> being the default. If C<$color> is negative, suppress
2581the message unless the client supports the msg packet.
2582
2583=cut
2584
2585our %CHANNEL = (
2586 "c/identify" => {
2587 id => "identify",
2588 title => "Identify",
2589 reply => undef,
2590 tooltip => "Items recently identified",
2591 },
2592 "c/examine" => {
2593 id => "examine",
2594 title => "Examine",
2595 reply => undef,
2596 tooltip => "Signs and other items you examined",
2597 },
2598);
2599
2600sub cf::client::send_msg {
2601 my ($self, $channel, $msg, $color, @extra) = @_;
2602
2603 $msg = $self->pl->expand_cfpod ($msg);
2604
2605 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606
2607 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2609
2610 if (ref $channel) {
2611 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg;
2616 }
2617
2618 $channel = $channel->{id};
2619 }
2620
2621 return unless @extra || length $msg;
2622
2623 if ($self->can_msg) {
2624 # default colour, mask it out
2625 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2626 if $color & cf::NDI_DEF;
2627
2628 $self->send_packet ("msg " . $self->{json_coder}->encode (
2629 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2630 } else {
2631 if ($color >= 0) {
2632 # replace some tags by gcfclient-compatible ones
2633 for ($msg) {
2634 1 while
2635 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2636 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2637 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2638 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2639 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2640 }
2641
2642 $color &= cf::NDI_COLOR_MASK;
2643
2644 utf8::encode $msg;
2645
2646 if (0 && $msg =~ /\[/) {
2647 # COMMAND/INFO
2648 $self->send_packet ("drawextinfo $color 10 8 $msg")
2649 } else {
2650 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2651 $self->send_packet ("drawinfo $color $msg")
2652 }
2653 }
2654 }
2655}
2656
2055=item $client->ext_event ($type, %msg) 2657=item $client->ext_msg ($type, @msg)
2056 2658
2057Sends an exti event to the client. 2659Sends an ext event to the client.
2058 2660
2059=cut 2661=cut
2060 2662
2061sub cf::client::ext_event($$%) { 2663sub cf::client::ext_msg($$@) {
2062 my ($self, $type, %msg) = @_; 2664 my ($self, $type, @msg) = @_;
2063 2665
2666 if ($self->extcmd == 2) {
2667 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2668 } elsif ($self->extcmd == 1) { # TODO: remove
2064 $msg{msgtype} = "event_$type"; 2669 push @msg, msgtype => "event_$type";
2065 $self->send_packet ("ext " . cf::to_json \%msg); 2670 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2671 }
2672}
2673
2674=item $client->ext_reply ($msgid, @msg)
2675
2676Sends an ext reply to the client.
2677
2678=cut
2679
2680sub cf::client::ext_reply($$@) {
2681 my ($self, $id, @msg) = @_;
2682
2683 if ($self->extcmd == 2) {
2684 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2685 } elsif ($self->extcmd == 1) {
2686 #TODO: version 1, remove
2687 unshift @msg, msgtype => "reply", msgid => $id;
2688 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2689 }
2066} 2690}
2067 2691
2068=item $success = $client->query ($flags, "text", \&cb) 2692=item $success = $client->query ($flags, "text", \&cb)
2069 2693
2070Queues a query to the client, calling the given callback with 2694Queues a query to the client, calling the given callback with
2071the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2695the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2072C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2696C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2073 2697
2074Queries can fail, so check the return code. Or don't, as queries will become 2698Queries can fail, so check the return code. Or don't, as queries will
2075reliable at some point in the future. 2699become reliable at some point in the future.
2076 2700
2077=cut 2701=cut
2078 2702
2079sub cf::client::query { 2703sub cf::client::query {
2080 my ($self, $flags, $text, $cb) = @_; 2704 my ($self, $flags, $text, $cb) = @_;
2088 utf8::encode $text; 2712 utf8::encode $text;
2089 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2713 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2090 2714
2091 $self->send_packet ($self->{query_queue}[0][0]) 2715 $self->send_packet ($self->{query_queue}[0][0])
2092 if @{ $self->{query_queue} } == 1; 2716 if @{ $self->{query_queue} } == 1;
2717
2718 1
2093} 2719}
2094 2720
2095cf::client->attach ( 2721cf::client->attach (
2722 on_connect => sub {
2723 my ($ns) = @_;
2724
2725 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2726 },
2096 on_reply => sub { 2727 on_reply => sub {
2097 my ($ns, $msg) = @_; 2728 my ($ns, $msg) = @_;
2098 2729
2099 # this weird shuffling is so that direct followup queries 2730 # this weird shuffling is so that direct followup queries
2100 # get handled first 2731 # get handled first
2112 } else { 2743 } else {
2113 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2744 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2114 } 2745 }
2115 } 2746 }
2116 }, 2747 },
2748 on_exticmd => sub {
2749 my ($ns, $buf) = @_;
2750
2751 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2752
2753 if (ref $msg) {
2754 my ($type, $reply, @payload) =
2755 "ARRAY" eq ref $msg
2756 ? @$msg
2757 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2758
2759 my @reply;
2760
2761 if (my $cb = $EXTICMD{$type}) {
2762 @reply = $cb->($ns, @payload);
2763 }
2764
2765 $ns->ext_reply ($reply, @reply)
2766 if $reply;
2767
2768 } else {
2769 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2770 }
2771
2772 cf::override;
2773 },
2117); 2774);
2118 2775
2119=item $client->async (\&cb) 2776=item $client->async (\&cb)
2120 2777
2121Create a new coroutine, running the specified callback. The coroutine will 2778Create a new coroutine, running the specified callback. The coroutine will
2162our $safe = new Safe "safe"; 2819our $safe = new Safe "safe";
2163our $safe_hole = new Safe::Hole; 2820our $safe_hole = new Safe::Hole;
2164 2821
2165$SIG{FPE} = 'IGNORE'; 2822$SIG{FPE} = 'IGNORE';
2166 2823
2167$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2824$safe->permit_only (Opcode::opset qw(
2825 :base_core :base_mem :base_orig :base_math
2826 grepstart grepwhile mapstart mapwhile
2827 sort time
2828));
2168 2829
2169# here we export the classes and methods available to script code 2830# here we export the classes and methods available to script code
2170 2831
2171=pod 2832=pod
2172 2833
2173The following functions and methods are available within a safe environment: 2834The following functions and methods are available within a safe environment:
2174 2835
2175 cf::object contr pay_amount pay_player map 2836 cf::object
2837 contr pay_amount pay_player map x y force_find force_add
2838 insert remove name archname title slaying race decrease_ob_nr
2839
2176 cf::object::player player 2840 cf::object::player
2177 cf::player peaceful 2841 player
2178 cf::map trigger 2842
2843 cf::player
2844 peaceful
2845
2846 cf::map
2847 trigger
2179 2848
2180=cut 2849=cut
2181 2850
2182for ( 2851for (
2183 ["cf::object" => qw(contr pay_amount pay_player map)], 2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race
2854 decrease_ob_nr)],
2184 ["cf::object::player" => qw(player)], 2855 ["cf::object::player" => qw(player)],
2185 ["cf::player" => qw(peaceful)], 2856 ["cf::player" => qw(peaceful)],
2186 ["cf::map" => qw(trigger)], 2857 ["cf::map" => qw(trigger)],
2187) { 2858) {
2188 no strict 'refs'; 2859 no strict 'refs';
2259=back 2930=back
2260 2931
2261=cut 2932=cut
2262 2933
2263############################################################################# 2934#############################################################################
2264
2265=head2 EXTENSION DATABASE SUPPORT
2266
2267Crossfire maintains a very simple database for extension use. It can
2268currently store anything that can be serialised using Storable, which
2269excludes objects.
2270
2271The parameter C<$family> should best start with the name of the extension
2272using it, it should be unique.
2273
2274=over 4
2275
2276=item $value = cf::db_get $family => $key
2277
2278Returns a single value from the database.
2279
2280=item cf::db_put $family => $key => $value
2281
2282Stores the given C<$value> in the family.
2283
2284=cut
2285
2286our $DB;
2287
2288sub db_init {
2289 unless ($DB) {
2290 $DB = BDB::db_create $DB_ENV;
2291
2292 cf::sync_job {
2293 eval {
2294 $DB->set_flags (BDB::CHKSUM);
2295
2296 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2297 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2298 cf::cleanup "db_open(db): $!" if $!;
2299 };
2300 cf::cleanup "db_open(db): $@" if $@;
2301 };
2302
2303 my $path = cf::localdir . "/database.pst";
2304 if (stat $path) {
2305 cf::sync_job {
2306 my $pst = Storable::retrieve $path;
2307
2308 cf::db_put (board => data => $pst->{board});
2309 cf::db_put (guildrules => data => $pst->{guildrules});
2310 cf::db_put (rent => balance => $pst->{rent}{balance});
2311 BDB::db_env_txn_checkpoint $DB_ENV;
2312
2313 unlink $path;
2314 };
2315 }
2316 }
2317}
2318
2319sub db_get($$) {
2320 my $key = "$_[0]/$_[1]";
2321
2322 cf::sync_job {
2323 BDB::db_get $DB, undef, $key, my $data;
2324
2325 $! ? ()
2326 : Compress::LZF::sthaw $data
2327 }
2328}
2329
2330sub db_put($$$) {
2331 BDB::dbreq_pri 4;
2332 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2333}
2334
2335#############################################################################
2336# the server's init and main functions 2935# the server's init and main functions
2337 2936
2338sub load_facedata { 2937sub load_facedata($) {
2339 my $path = sprintf "%s/facedata", cf::datadir; 2938 my ($path) = @_;
2939
2940 # HACK to clear player env face cache, we need some signal framework
2941 # for this (global event?)
2942 %ext::player_env::MUSIC_FACE_CACHE = ();
2943
2944 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2340 2945
2341 warn "loading facedata from $path\n"; 2946 warn "loading facedata from $path\n";
2342 2947
2343 my $facedata; 2948 my $facedata;
2344 0 < aio_load $path, $facedata 2949 0 < aio_load $path, $facedata
2347 $facedata = Coro::Storable::thaw $facedata; 2952 $facedata = Coro::Storable::thaw $facedata;
2348 2953
2349 $facedata->{version} == 2 2954 $facedata->{version} == 2
2350 or cf::cleanup "$path: version mismatch, cannot proceed."; 2955 or cf::cleanup "$path: version mismatch, cannot proceed.";
2351 2956
2957 # patch in the exptable
2958 $facedata->{resource}{"res/exp_table"} = {
2959 type => FT_RSRC,
2960 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2961 };
2962 cf::cede_to_tick;
2963
2352 { 2964 {
2353 my $faces = $facedata->{faceinfo}; 2965 my $faces = $facedata->{faceinfo};
2354 2966
2355 while (my ($face, $info) = each %$faces) { 2967 while (my ($face, $info) = each %$faces) {
2356 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2968 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2357 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2969 cf::face::set_visibility $idx, $info->{visibility};
2970 cf::face::set_magicmap $idx, $info->{magicmap};
2358 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2359 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2360 Coro::cede; 2973
2974 cf::cede_to_tick;
2361 } 2975 }
2362 2976
2363 while (my ($face, $info) = each %$faces) { 2977 while (my ($face, $info) = each %$faces) {
2364 next unless $info->{smooth}; 2978 next unless $info->{smooth};
2365 my $idx = cf::face::find $face 2979 my $idx = cf::face::find $face
2366 or next; 2980 or next;
2367 if (my $smooth = cf::face::find $info->{smooth}) { 2981 if (my $smooth = cf::face::find $info->{smooth}) {
2982 cf::face::set_smooth $idx, $smooth;
2368 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2983 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2369 } else { 2984 } else {
2370 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2985 warn "smooth face '$info->{smooth}' not found for face '$face'";
2371 } 2986 }
2372 Coro::cede; 2987
2988 cf::cede_to_tick;
2373 } 2989 }
2374 } 2990 }
2375 2991
2376 { 2992 {
2377 my $anims = $facedata->{animinfo}; 2993 my $anims = $facedata->{animinfo};
2378 2994
2379 while (my ($anim, $info) = each %$anims) { 2995 while (my ($anim, $info) = each %$anims) {
2380 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2996 cf::anim::set $anim, $info->{frames}, $info->{facings};
2381 Coro::cede; 2997 cf::cede_to_tick;
2382 } 2998 }
2383 2999
2384 cf::anim::invalidate_all; # d'oh 3000 cf::anim::invalidate_all; # d'oh
2385 } 3001 }
2386 3002
3003 {
3004 # TODO: for gcfclient pleasure, we should give resources
3005 # that gcfclient doesn't grok a >10000 face index.
3006 my $res = $facedata->{resource};
3007
3008 my $soundconf = delete $res->{"res/sound.conf"};
3009
3010 while (my ($name, $info) = each %$res) {
3011 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data;
3013
3014 if ($info->{type} & 1) {
3015 # prepend meta info
3016
3017 my $meta = $enc->encode ({
3018 name => $name,
3019 %{ $info->{meta} || {} },
3020 });
3021
3022 $data = pack "(w/a*)*", $meta, $info->{data};
3023 } else {
3024 $data = $info->{data};
3025 }
3026
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
3030 cf::cede_to_tick;
3031 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
3050 }
3051
2387 1 3052 1
2388} 3053}
2389 3054
3055register_exticmd fx_want => sub {
3056 my ($ns, $want) = @_;
3057
3058 while (my ($k, $v) = each %$want) {
3059 $ns->fx_want ($k, $v);
3060 }
3061};
3062
3063sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = ();
3067
3068 load_resource_file "$MAPDIR/regions"
3069 or die "unable to load regions file\n";
3070
3071 for (cf::region::list) {
3072 $_->{match} = qr/$_->{match}/
3073 if exists $_->{match};
3074 }
3075}
3076
3077sub reload_facedata {
3078 load_facedata "$DATADIR/facedata"
3079 or die "unable to load facedata\n";
3080}
3081
3082sub reload_archetypes {
3083 load_resource_file "$DATADIR/archetypes"
3084 or die "unable to load archetypes\n";
3085 #d# NEED to laod twice to resolve forward references
3086 # this really needs to be done in an extra post-pass
3087 # (which needs to be synchronous, so solve it differently)
3088 load_resource_file "$DATADIR/archetypes"
3089 or die "unable to load archetypes\n";
3090}
3091
3092sub reload_treasures {
3093 load_resource_file "$DATADIR/treasures"
3094 or die "unable to load treasurelists\n";
3095}
3096
2390sub reload_resources { 3097sub reload_resources {
2391 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3098 warn "reloading resource files...\n";
2392 or die "unable to load regions file\n";#d# 3099
3100 reload_regions;
2393 load_facedata 3101 reload_facedata;
2394 or die "unable to load facedata\n";#d# 3102 #reload_archetypes;#d#
3103 reload_archetypes;
3104 reload_treasures;
3105
3106 warn "finished reloading resource files\n";
2395} 3107}
2396 3108
2397sub init { 3109sub init {
2398 reload_resources; 3110 reload_resources;
2399} 3111}
2400 3112
2401sub cfg_load { 3113sub reload_config {
2402 open my $fh, "<:utf8", cf::confdir . "/config" 3114 open my $fh, "<:utf8", "$CONFDIR/config"
2403 or return; 3115 or return;
2404 3116
2405 local $/; 3117 local $/;
2406 *CFG = YAML::Syck::Load <$fh>; 3118 *CFG = YAML::Syck::Load <$fh>;
2407 3119
2426 (async { 3138 (async {
2427 Event::one_event; 3139 Event::one_event;
2428 })->prio (Coro::PRIO_MAX); 3140 })->prio (Coro::PRIO_MAX);
2429 }; 3141 };
2430 3142
2431 cfg_load; 3143 reload_config;
2432 db_init; 3144 db_init;
2433 load_extensions; 3145 load_extensions;
2434 3146
2435 $TICK_WATCHER->start; 3147 $TICK_WATCHER->start;
2436 Event::loop; 3148 Event::loop;
2452 }, 3164 },
2453 ); 3165 );
2454 } 3166 }
2455} 3167}
2456 3168
3169sub write_runtime {
3170 my $runtime = "$LOCALDIR/runtime";
3171
3172 # first touch the runtime file to show we are still running:
3173 # the fsync below can take a very very long time.
3174
3175 IO::AIO::aio_utime $runtime, undef, undef;
3176
3177 my $guard = cf::lock_acquire "write_runtime";
3178
3179 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3180 or return;
3181
3182 my $value = $cf::RUNTIME + 90 + 10;
3183 # 10 is the runtime save interval, for a monotonic clock
3184 # 60 allows for the watchdog to kill the server.
3185
3186 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3187 and return;
3188
3189 # always fsync - this file is important
3190 aio_fsync $fh
3191 and return;
3192
3193 # touch it again to show we are up-to-date
3194 aio_utime $fh, undef, undef;
3195
3196 close $fh
3197 or return;
3198
3199 aio_rename "$runtime~", $runtime
3200 and return;
3201
3202 warn "runtime file written.\n";
3203
3204 1
3205}
3206
2457sub emergency_save() { 3207sub emergency_save() {
2458 my $freeze_guard = cf::freeze_mainloop; 3208 my $freeze_guard = cf::freeze_mainloop;
2459 3209
2460 warn "enter emergency perl save\n"; 3210 warn "enter emergency perl save\n";
2461 3211
2492 3242
2493 warn Carp::longmess "post_cleanup backtrace" 3243 warn Carp::longmess "post_cleanup backtrace"
2494 if $make_core; 3244 if $make_core;
2495} 3245}
2496 3246
2497sub reload() { 3247sub do_reload_perl() {
2498 # can/must only be called in main 3248 # can/must only be called in main
2499 if ($Coro::current != $Coro::main) { 3249 if ($Coro::current != $Coro::main) {
2500 warn "can only reload from main coroutine"; 3250 warn "can only reload from main coroutine";
2501 return; 3251 return;
2502 } 3252 }
2536 %EXT_CORO = (); 3286 %EXT_CORO = ();
2537 3287
2538 warn "removing commands"; 3288 warn "removing commands";
2539 %COMMAND = (); 3289 %COMMAND = ();
2540 3290
2541 warn "removing ext commands"; 3291 warn "removing ext/exti commands";
2542 %EXTCMD = (); 3292 %EXTCMD = ();
3293 %EXTICMD = ();
2543 3294
2544 warn "unloading/nuking all extensions"; 3295 warn "unloading/nuking all extensions";
2545 for my $pkg (@EXTS) { 3296 for my $pkg (@EXTS) {
2546 warn "... unloading $pkg"; 3297 warn "... unloading $pkg";
2547 3298
2577 Symbol::delete_package "safe::$_" 3328 Symbol::delete_package "safe::$_"
2578 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3329 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2579 3330
2580 warn "unloading cf.pm \"a bit\""; 3331 warn "unloading cf.pm \"a bit\"";
2581 delete $INC{"cf.pm"}; 3332 delete $INC{"cf.pm"};
3333 delete $INC{"cf/pod.pm"};
2582 3334
2583 # don't, removes xs symbols, too, 3335 # don't, removes xs symbols, too,
2584 # and global variables created in xs 3336 # and global variables created in xs
2585 #Symbol::delete_package __PACKAGE__; 3337 #Symbol::delete_package __PACKAGE__;
2586 3338
2589 warn "reloading cf.pm"; 3341 warn "reloading cf.pm";
2590 require cf; 3342 require cf;
2591 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2592 3344
2593 warn "loading config and database again"; 3345 warn "loading config and database again";
2594 cf::cfg_load; 3346 cf::reload_config;
2595 3347
2596 warn "loading extensions"; 3348 warn "loading extensions";
2597 cf::load_extensions; 3349 cf::load_extensions;
2598 3350
2599 warn "reattaching attachments to objects/players"; 3351 warn "reattaching attachments to objects/players";
2601 warn "reattaching attachments to maps"; 3353 warn "reattaching attachments to maps";
2602 reattach $_ for values %MAP; 3354 reattach $_ for values %MAP;
2603 warn "reattaching attachments to players"; 3355 warn "reattaching attachments to players";
2604 reattach $_ for values %PLAYER; 3356 reattach $_ for values %PLAYER;
2605 3357
2606 warn "loading reloadable resources";
2607 reload_resources;
2608
2609 warn "leaving sync_job"; 3358 warn "leaving sync_job";
2610 3359
2611 1 3360 1
2612 } or do { 3361 } or do {
2613 warn $@; 3362 warn $@;
2618 warn "reloaded"; 3367 warn "reloaded";
2619}; 3368};
2620 3369
2621our $RELOAD_WATCHER; # used only during reload 3370our $RELOAD_WATCHER; # used only during reload
2622 3371
3372sub reload_perl() {
3373 # doing reload synchronously and two reloads happen back-to-back,
3374 # coro crashes during coro_state_free->destroy here.
3375
3376 $RELOAD_WATCHER ||= Event->timer (
3377 reentrant => 0,
3378 after => 0,
3379 data => WF_AUTOCANCEL,
3380 cb => sub {
3381 do_reload_perl;
3382 undef $RELOAD_WATCHER;
3383 },
3384 );
3385}
3386
2623register_command "reload" => sub { 3387register_command "reload" => sub {
2624 my ($who, $arg) = @_; 3388 my ($who, $arg) = @_;
2625 3389
2626 if ($who->flag (FLAG_WIZ)) { 3390 if ($who->flag (FLAG_WIZ)) {
2627 $who->message ("reloading server."); 3391 $who->message ("reloading server.");
2628 3392 async { reload_perl };
2629 # doing reload synchronously and two reloads happen back-to-back,
2630 # coro crashes during coro_state_free->destroy here.
2631
2632 $RELOAD_WATCHER ||= Event->timer (
2633 reentrant => 0,
2634 after => 0,
2635 data => WF_AUTOCANCEL,
2636 cb => sub {
2637 reload;
2638 undef $RELOAD_WATCHER;
2639 },
2640 );
2641 } 3393 }
2642}; 3394};
2643 3395
2644unshift @INC, $LIBDIR; 3396unshift @INC, $LIBDIR;
2645 3397
2646my $bug_warning = 0; 3398my $bug_warning = 0;
2647 3399
3400our @WAIT_FOR_TICK;
3401our @WAIT_FOR_TICK_BEGIN;
3402
3403sub wait_for_tick {
3404 return unless $TICK_WATCHER->is_active;
3405 return if $Coro::current == $Coro::main;
3406
3407 my $signal = new Coro::Signal;
3408 push @WAIT_FOR_TICK, $signal;
3409 $signal->wait;
3410}
3411
3412sub wait_for_tick_begin {
3413 return unless $TICK_WATCHER->is_active;
3414 return if $Coro::current == $Coro::main;
3415
3416 my $signal = new Coro::Signal;
3417 push @WAIT_FOR_TICK_BEGIN, $signal;
3418 $signal->wait;
3419}
3420
3421 my $min = 1e6;#d#
3422 my $avg = 10;
2648$TICK_WATCHER = Event->timer ( 3423$TICK_WATCHER = Event->timer (
2649 reentrant => 0, 3424 reentrant => 0,
2650 parked => 1, 3425 parked => 1,
2651 prio => 0, 3426 prio => 0,
2652 at => $NEXT_TICK || $TICK, 3427 at => $NEXT_TICK || $TICK,
2656 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3431 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2657 unless ++$bug_warning > 10; 3432 unless ++$bug_warning > 10;
2658 return; 3433 return;
2659 } 3434 }
2660 3435
2661 $NOW = Event::time; 3436 $NOW = $tick_start = Event::time;
2662 3437
2663 cf::server_tick; # one server iteration 3438 cf::server_tick; # one server iteration
3439
3440 0 && sync_job {#d#
3441 for(1..10) {
3442 my $t = Event::time;
3443 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3444 or die;
3445
3446 $map->width (50);
3447 $map->height (50);
3448 $map->alloc;
3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3450 my $t = Event::time - $t;
3451
3452 #next unless $t < 0.0013;#d#
3453 if ($t < $min) {
3454 $min = $t;
3455 }
3456 $avg = $avg * 0.99 + $t * 0.01;
3457 }
3458 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3459 exit 0;
3460 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3461 };
3462
2664 $RUNTIME += $TICK; 3463 $RUNTIME += $TICK;
2665 $NEXT_TICK += $TICK; 3464 $NEXT_TICK += $TICK;
2666 3465
2667 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3466 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2668 $NEXT_RUNTIME_WRITE = $NOW + 10; 3467 $NEXT_RUNTIME_WRITE = $NOW + 10;
2670 write_runtime 3469 write_runtime
2671 or warn "ERROR: unable to write runtime file: $!"; 3470 or warn "ERROR: unable to write runtime file: $!";
2672 }; 3471 };
2673 } 3472 }
2674 3473
2675 $WAIT_FOR_TICK->broadcast;
2676 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2677
2678# my $AFTER = Event::time; 3474# my $AFTER = Event::time;
2679# warn $AFTER - $NOW;#d# 3475# warn $AFTER - $NOW;#d#
2680 3476
3477 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3478 $sig->send;
3479 }
3480 while (my $sig = shift @WAIT_FOR_TICK) {
3481 $sig->send;
3482 }
3483
3484 $NOW = Event::time;
3485
2681 # if we are delayed by four ticks or more, skip them all 3486 # if we are delayed by four ticks or more, skip them all
2682 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3487 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2683 3488
2684 $TICK_WATCHER->at ($NEXT_TICK); 3489 $TICK_WATCHER->at ($NEXT_TICK);
2685 $TICK_WATCHER->start; 3490 $TICK_WATCHER->start;
3491
3492 $LOAD = ($NOW - $tick_start) / $TICK;
3493 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3494
3495 _post_tick;
3496
3497
2686 }, 3498 },
2687); 3499);
2688 3500
2689{ 3501{
2690 BDB::max_poll_time $TICK * 0.1; 3502 BDB::max_poll_time $TICK * 0.1;
2718 3530
2719 cf::sync_job { 3531 cf::sync_job {
2720 eval { 3532 eval {
2721 BDB::db_env_open 3533 BDB::db_env_open
2722 $DB_ENV, 3534 $DB_ENV,
2723 $BDB_ENV_DIR, 3535 $BDBDIR,
2724 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3536 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2725 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3537 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2726 0666; 3538 0666;
2727 3539
2728 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3540 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2729 3541
2730 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3542 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2731 $DB_ENV->set_lk_detect; 3543 $DB_ENV->set_lk_detect;
2732 }; 3544 };
2733 3545
2749 prio => 6, 3561 prio => 6,
2750 cb => \&IO::AIO::poll_cb, 3562 cb => \&IO::AIO::poll_cb,
2751 ); 3563 );
2752} 3564}
2753 3565
3566my $_log_backtrace;
3567
3568sub _log_backtrace {
3569 my ($msg, @addr) = @_;
3570
3571 $msg =~ s/\n//;
3572
3573 # limit the # of concurrent backtraces
3574 if ($_log_backtrace < 2) {
3575 ++$_log_backtrace;
3576 async {
3577 my @bt = fork_call {
3578 @addr = map { sprintf "%x", $_ } @addr;
3579 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3580 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3581 or die "addr2line: $!";
3582
3583 my @funcs;
3584 my @res = <$fh>;
3585 chomp for @res;
3586 while (@res) {
3587 my ($func, $line) = splice @res, 0, 2, ();
3588 push @funcs, "[$func] $line";
3589 }
3590
3591 @funcs
3592 };
3593
3594 LOG llevInfo, "[ABT] $msg\n";
3595 LOG llevInfo, "[ABT] $_\n" for @bt;
3596 --$_log_backtrace;
3597 };
3598 } else {
3599 LOG llevInfo, "[ABT] $msg\n";
3600 LOG llevInfo, "[ABT] [suppressed]\n";
3601 }
3602}
3603
3604# load additional modules
3605use cf::pod;
3606
2754END { cf::emergency_save } 3607END { cf::emergency_save }
2755 3608
27561 36091
2757 3610

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines