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.232 by root, Wed Apr 4 02:07:19 2007 UTC vs.
Revision 1.351 by root, Sun Sep 2 00:57:38 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines