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.224 by root, Mon Mar 12 21:42:12 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43:46 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;
31use YAML::Syck ();
26use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
27use YAML::Syck ();
28use Time::HiRes; 33use Time::HiRes;
29use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
30 36
37# configure various modules to our taste
38#
39$Storable::canonical = 1; # reduce rsync transfers
31Coro::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
32Compress::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
42
33$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
34
35sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
36 44
37# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
38$YAML::Syck::ImplicitUnicode = 1; 46$YAML::Syck::ImplicitUnicode = 1;
39 47
40$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
41 49
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51
42our %COMMAND = (); 52our %COMMAND = ();
43our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
44 54
45our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
46our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
47our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
48our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
49 60
50our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
51our @EVENT; 62our @EVENT;
52our $LIBDIR = datadir . "/ext";
53 63
54our $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(!)
55our $TICK_WATCHER; 77our $TICK_WATCHER;
56our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
57our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
58our $NEXT_TICK; 80our $NEXT_TICK;
59our $NOW; 81our $NOW;
68our $RUNTIME; 90our $RUNTIME;
69 91
70our %PLAYER; # all users 92our %PLAYER; # all users
71our %MAP; # all maps 93our %MAP; # all maps
72our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
73our $RANDOM_MAPS = cf::localdir . "/random";
74our $BDB_ENV_DIR = cf::localdir . "/db";
75
76our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
77our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
78 95
79# 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 ∕
80our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
81 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
82binmode STDOUT; 103binmode STDOUT;
83binmode STDERR; 104binmode STDERR;
84 105
85# read virtual server time, if available 106# read virtual server time, if available
86unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
87 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
88 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
89 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
90} 111}
91 112
92mkdir cf::localdir; 113mkdir $_
93mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
94mkdir cf::localdir . "/" . cf::tmpdir;
95mkdir cf::localdir . "/" . cf::uniquedir;
96mkdir $RANDOM_MAPS;
97mkdir $BDB_ENV_DIR;
98 115
99our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
100 117
101sub cf::map::normalise; 118sub cf::map::normalise;
102 119
113=item $cf::RUNTIME 130=item $cf::RUNTIME
114 131
115The 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
116every server tick. 133every server tick.
117 134
118=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
119 138
120The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
121be 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.
122 143
123=item $cf::NOW 144=item $cf::NOW
124 145
125The time of the last (current) server tick. 146The time of the last (current) server tick.
126 147
127=item $cf::TICK 148=item $cf::TICK
128 149
129The 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.
130 161
131=item %cf::CFG 162=item %cf::CFG
132 163
133Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
134from wherever your confdir points to. 165from wherever your confdir points to.
135 166
136=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
137 168
138These 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
139or 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
140processing 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.
141window 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.
142 178
143=back 179=back
144 180
145=cut 181=cut
146 182
147BEGIN { 183BEGIN {
148 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
149 my $msg = join "", @_; 185 my $msg = join "", @_;
150 utf8::encode $msg;
151 186
152 $msg .= "\n" 187 $msg .= "\n"
153 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
154 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
155 LOG llevError, $msg; 193 LOG llevError, $msg;
156 }; 194 };
157} 195}
158 196
159@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
160@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
161@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
162@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
163@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';
164@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)
165 204
166# 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
167# within the Safe compartment. 206# within the Safe compartment.
168for my $pkg (qw( 207for my $pkg (qw(
169 cf::global cf::attachable 208 cf::global cf::attachable
177} 216}
178 217
179$Event::DIED = sub { 218$Event::DIED = sub {
180 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
181}; 220};
221
222#############################################################################
182 223
183=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
184 225
185=over 4 226=over 4
186 227
205 $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;
206 $d 247 $d
207 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
208} 249}
209 250
210use JSON::Syck (); # TODO# replace by JSON::PC once working
211
212=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
213 252
214Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
215 254
216=cut
217
218sub from_json($) {
219 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
220 JSON::Syck::Load $_[0]
221}
222
223=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
224 256
225Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
226 258
227=cut 259=cut
228 260
229sub to_json($) { 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
230 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 262
231 JSON::Syck::Dump $_[0] 263sub to_json ($) { $json_coder->encode ($_[0]) }
232} 264sub from_json ($) { $json_coder->decode ($_[0]) }
233 265
234=item cf::lock_wait $string 266=item cf::lock_wait $string
235 267
236Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
237 269
240Wait 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
241a 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,
242for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
243returned. 275returned.
244 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
245Lock 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
246uses 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.
247 286
248=cut 287=cut
249 288
250our %LOCK; 289our %LOCK;
251 290
269 308
270 Coro::guard { 309 Coro::guard {
271 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
272 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
273 } 312 }
313}
314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
274} 319}
275 320
276sub freeze_mainloop { 321sub freeze_mainloop {
277 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
278 323
281 }; 326 };
282 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
283 $guard 328 $guard
284} 329}
285 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
286=item cf::async { BLOCK } 387=item cf::async { BLOCK }
287 388
288Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
289C<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
290thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
293 394
294BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
295 396
296=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
297 398
298The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
299always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
300reentrant. 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.
301 403
302If 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
303the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
304server 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
305fast or be very important. 407fast or be very important.
308 410
309sub sync_job(&) { 411sub sync_job(&) {
310 my ($job) = @_; 412 my ($job) = @_;
311 413
312 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
313 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
314 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
315 419
316 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
317 # (but this is cancel-safe) 421 # (but this is cancel-safe)
328 432
329 while ($busy) { 433 while ($busy) {
330 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
331 } 435 }
332 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
333 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
334 } else { 445 } else {
335 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
336 447
337 $job->() 448 $job->()
356 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
357 468
358 $coro 469 $coro
359} 470}
360 471
361sub write_runtime { 472=item fork_call { }, $args
362 my $guard = cf::lock_acquire "write_runtime";
363 473
364 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.
365 478
366 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479=cut
367 or return;
368 480
369 my $value = $cf::RUNTIME + 90 + 10; 481sub fork_call(&@) {
370 # 10 is the runtime save interval, for a monotonic clock 482 my ($cb, @args) = @_;
371 # 60 allows for the watchdog to kill the server.
372 483
373 (aio_write $fh, 0, (length $value), $value, 0) <= 0 484 # we seemingly have to make a local copy of the whole thing,
374 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious)
375 487
376 # always fsync - this file is important 488 my @res = Coro::Util::fork_eval {
377 aio_fsync $fh 489 reset_signals;
378 and return; 490 &$cb
491 }, @args;
379 492
380 close $fh 493 wantarray ? @res : $res[-1]
381 or return; 494}
382 495
383 aio_rename "$runtime~", $runtime 496=item $value = cf::db_get $family => $key
384 and return;
385 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 };
386 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"
610}
611
612=item cf::datalog type => key => value, ...
613
614Log a datalog packet of the given type with the given key-value pairs.
615
616=cut
617
618sub datalog($@) {
619 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
387} 621}
388 622
389=back 623=back
390 624
391=cut 625=cut
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/(?<![BIUGHT])</&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 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1478 # replace G<male|female> tags
1479 || s{G<([^>|]*)\|([^>]*)>}{
1480 $self->gender ? $2 : $1
1481 }ge
1482 # replace H<hint text>
1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1490
1491 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g;
1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1500 $_
1501}
1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507
1129=item $player->ext_reply ($msgid, $msgtype, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1130 1509
1131Sends an ext reply to the player. 1510Sends an ext reply to the player.
1132 1511
1133=cut 1512=cut
1134 1513
1135sub ext_reply($$$%) { 1514sub ext_reply($$@) {
1136 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1137 1516
1138 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1139
1140 $self->send ("ext " . cf::to_json \%msg);
1141} 1518}
1142 1519
1143package cf; 1520=item $player->ext_msg ($type, @msg)
1521
1522Sends an ext event to the client.
1523
1524=cut
1525
1526sub ext_msg($$@) {
1527 my ($self, $type, @msg) = @_;
1528
1529 $self->ns->ext_msg ($type, @msg);
1530}
1531
1532=head3 cf::region
1533
1534=over 4
1535
1536=cut
1537
1538package cf::region;
1539
1540=item cf::region::find_by_path $path
1541
1542Tries to decuce the likely region for a map knowing only its path.
1543
1544=cut
1545
1546sub find_by_path($) {
1547 my ($path) = @_;
1548
1549 my ($match, $specificity);
1550
1551 for my $region (list) {
1552 if ($region->{match} && $path =~ $region->{match}) {
1553 ($match, $specificity) = ($region, $region->specificity)
1554 if $region->specificity > $specificity;
1555 }
1556 }
1557
1558 $match
1559}
1144 1560
1145=back 1561=back
1146
1147 1562
1148=head3 cf::map 1563=head3 cf::map
1149 1564
1150=over 4 1565=over 4
1151 1566
1206 my ($self, $merge) = @_; 1621 my ($self, $merge) = @_;
1207 1622
1208 # we have to keep some variables in memory intact 1623 # we have to keep some variables in memory intact
1209 local $self->{path}; 1624 local $self->{path};
1210 local $self->{load_path}; 1625 local $self->{load_path};
1211 local $self->{deny_save};
1212 local $self->{deny_reset};
1213 1626
1214 $self->SUPER::thawer_merge ($merge); 1627 $self->SUPER::thawer_merge ($merge);
1215} 1628}
1216 1629
1217sub normalise { 1630sub normalise {
1264 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1265 return $self; 1678 return $self;
1266 } 1679 }
1267 } 1680 }
1268 1681
1269 Carp::carp "unable to resolve path '$path' (base '$base')."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1270 () 1683 ()
1271} 1684}
1272 1685
1273sub init { 1686sub init {
1274 my ($self) = @_; 1687 my ($self) = @_;
1289 1702
1290# the original (read-only) location 1703# the original (read-only) location
1291sub load_path { 1704sub load_path {
1292 my ($self) = @_; 1705 my ($self) = @_;
1293 1706
1294 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1707 "$MAPDIR/$self->{path}.map"
1295} 1708}
1296 1709
1297# the temporary/swap location 1710# the temporary/swap location
1298sub save_path { 1711sub save_path {
1299 my ($self) = @_; 1712 my ($self) = @_;
1300 1713
1301 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1302 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1715 "$TMPDIR/$path.map"
1303} 1716}
1304 1717
1305# the unique path, undef == no special unique path 1718# the unique path, undef == no special unique path
1306sub uniq_path { 1719sub uniq_path {
1307 my ($self) = @_; 1720 my ($self) = @_;
1308 1721
1309 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1310 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1723 "$UNIQUEDIR/$path"
1311} 1724}
1312 1725
1313# and all this just because we cannot iterate over 1726# and all this just because we cannot iterate over
1314# all maps in C++... 1727# all maps in C++...
1315sub change_all_map_light { 1728sub change_all_map_light {
1316 my ($change) = @_; 1729 my ($change) = @_;
1317 1730
1318 $_->change_map_light ($change) 1731 $_->change_map_light ($change)
1319 for grep $_->outdoor, values %cf::MAP; 1732 for grep $_->outdoor, values %cf::MAP;
1733}
1734
1735sub decay_objects {
1736 my ($self) = @_;
1737
1738 return if $self->{deny_reset};
1739
1740 $self->do_decay_objects;
1320} 1741}
1321 1742
1322sub unlink_save { 1743sub unlink_save {
1323 my ($self) = @_; 1744 my ($self) = @_;
1324 1745
1382 $self->load_header_orig 1803 $self->load_header_orig
1383 or return; 1804 or return;
1384 $self->prepare_orig; 1805 $self->prepare_orig;
1385 } 1806 }
1386 1807
1808 $self->{deny_reset} = 1
1809 if $self->no_reset;
1810
1811 $self->default_region (cf::region::find_by_path $self->{path})
1812 unless $self->default_region;
1813
1387 1 1814 1
1388} 1815}
1389 1816
1390sub find; 1817sub find;
1391sub find { 1818sub find {
1403 $map->{last_save} = $cf::RUNTIME; 1830 $map->{last_save} = $cf::RUNTIME;
1404 1831
1405 $map->load_header 1832 $map->load_header
1406 or return; 1833 or return;
1407 1834
1408 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1409 # doing this can freeze the server in a sync job, obviously 1836 # doing this can freeze the server in a sync job, obviously
1410 #$cf::WAIT_FOR_TICK->wait; 1837 #$cf::WAIT_FOR_TICK->wait;
1411 $map->reset; 1838 $map->reset;
1412 undef $guard; 1839 undef $guard;
1413 return find $path; 1840 return find $path;
1424 my ($self) = @_; 1851 my ($self) = @_;
1425 1852
1426 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1427 1854
1428 my $path = $self->{path}; 1855 my $path = $self->{path};
1856
1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1429 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1430 1860
1431 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1432 1862
1433 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1434 1864
1435 $self->alloc; 1865 $self->alloc;
1436 1866
1437 $self->pre_load; 1867 $self->pre_load;
1868 cf::cede_to_tick;
1438 1869
1439 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1440 or return; 1871 or return;
1441 1872
1442 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1443 if delete $self->{load_original}; 1874 if delete $self->{load_original};
1444 1875
1445 if (my $uniq = $self->uniq_path) { 1876 if (my $uniq = $self->uniq_path) {
1446 utf8::encode $uniq; 1877 utf8::encode $uniq;
1447 if (aio_open $uniq, O_RDONLY, 0) { 1878 if (aio_open $uniq, O_RDONLY, 0) {
1448 $self->clear_unique_items; 1879 $self->clear_unique_items;
1449 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1450 } 1881 }
1451 } 1882 }
1452 1883
1453 Coro::cede; 1884 cf::cede_to_tick;
1454
1455 # now do the right thing for maps 1885 # now do the right thing for maps
1456 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1457
1458 unless ($self->{deny_activate}) {
1459 $self->decay_objects;
1460 $self->fix_auto_apply;
1461 $self->update_buttons;
1462 Coro::cede;
1463 $self->set_darkness_map;
1464 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1465 unless $self->difficulty; 1888 unless $self->difficulty;
1466 Coro::cede; 1889 cf::cede_to_tick;
1890
1891 unless ($self->{deny_activate}) {
1892 $self->decay_objects;
1893 $self->fix_auto_apply;
1894 $self->update_buttons;
1895 cf::cede_to_tick;
1896 $self->set_darkness_map;
1897 cf::cede_to_tick;
1467 $self->activate; 1898 $self->activate;
1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1903
1904 $self->in_memory (cf::MAP_IN_MEMORY);
1468 } 1905 }
1469 1906
1470 $self->post_load; 1907 $self->post_load;
1471
1472 $self->in_memory (cf::MAP_IN_MEMORY);
1473} 1908}
1474 1909
1475sub customise_for { 1910sub customise_for {
1476 my ($self, $ob) = @_; 1911 my ($self, $ob) = @_;
1477 1912
1478 return find "~" . $ob->name . "/" . $self->{path} 1913 return find "~" . $ob->name . "/" . $self->{path}
1479 if $self->per_player; 1914 if $self->per_player;
1480 1915
1916# return find "?party/" . $ob->name . "/" . $self->{path}
1917# if $self->per_party;
1918
1481 $self 1919 $self
1482} 1920}
1483 1921
1484# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1485sub load_diag { 1923sub load_neighbours {
1486 my ($map) = @_; 1924 my ($map) = @_;
1487 1925
1488 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1489 1927
1490 for (0 .. 3) { 1928 for (0 .. 3) {
1491 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1492 or next; 1930 or next;
1493 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1494 or next; 1932 or next;
1495 $neigh->load; 1933 $neigh->load;
1496 1934
1935 push @neigh,
1497 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1498 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1499 } 1938 }
1500 1939
1501 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1502 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1503 or next; 1943 or next;
1504 $neigh->load; 1944 $neigh->load;
1505 } 1945 }
1506} 1946}
1507 1947
1512} 1952}
1513 1953
1514sub do_load_sync { 1954sub do_load_sync {
1515 my ($map) = @_; 1955 my ($map) = @_;
1516 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1517 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1518} 1961}
1519 1962
1520our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1521our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1522 1965
1523sub find_async { 1966sub find_async {
1524 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1525 1968
1526 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1527 1970
1528 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1529 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1530 } 1973 }
1531 1974
1532 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1533 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1534 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1535 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1536 my $map = find $path 1980 if (my $map = find $k) {
1537 or next;
1538 $map->load; 1981 $map->load if $v;
1982 }
1539 1983
1540 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1541 } 1985 }
1542 } 1986 }
1543 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1544 }; 1988 };
1545 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
1548} 1992}
1549 1993
1550sub save { 1994sub save {
1551 my ($self) = @_; 1995 my ($self) = @_;
1552 1996
1553 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1554 1998
1555 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1556 2000
1557 return unless $self->dirty; 2001 return unless $self->dirty;
1558 2002
1581 my ($self) = @_; 2025 my ($self) = @_;
1582 2026
1583 # save first because save cedes 2027 # save first because save cedes
1584 $self->save; 2028 $self->save;
1585 2029
1586 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1587 2031
1588 return if $self->players; 2032 return if $self->players;
1589 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1590 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1591 2035
1595 2039
1596sub reset_at { 2040sub reset_at {
1597 my ($self) = @_; 2041 my ($self) = @_;
1598 2042
1599 # TODO: safety, remove and allow resettable per-player maps 2043 # TODO: safety, remove and allow resettable per-player maps
1600 return 1e99 if $self->isa ("ext::map_per_player");#d#
1601 return 1e99 if $self->{deny_reset}; 2044 return 1e99 if $self->{deny_reset};
1602 2045
1603 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2046 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1604 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2047 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1605 2048
1616 my ($self) = @_; 2059 my ($self) = @_;
1617 2060
1618 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2061 my $lock = cf::lock_acquire "map_data:$self->{path}";
1619 2062
1620 return if $self->players; 2063 return if $self->players;
1621 return if $self->isa ("ext::map_per_player");#d#
1622 2064
1623 warn "resetting map ", $self->path;#d# 2065 warn "resetting map ", $self->path;
1624 2066
1625 $self->in_memory (cf::MAP_SWAPPED); 2067 $self->in_memory (cf::MAP_SWAPPED);
1626 2068
1627 # need to save uniques path 2069 # need to save uniques path
1628 unless ($self->{deny_save}) { 2070 unless ($self->{deny_save}) {
1645my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
1646 2088
1647sub nuke { 2089sub nuke {
1648 my ($self) = @_; 2090 my ($self) = @_;
1649 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
1650 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
1651 2096
1652 $self->unlink_save; 2097 $self->unlink_save;
1653 2098
1654 bless $self, "cf::map"; 2099 bless $self, "cf::map";
1655 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
1656 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
1657 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
1658 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1659 2104
1660 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
1661 2107
1662 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2109}
2110
2111=item $maps = cf::map::tmp_maps
2112
2113Returns an arrayref with all map paths of currently instantiated and saved
2114maps. May block.
2115
2116=cut
2117
2118sub tmp_maps() {
2119 [
2120 map {
2121 utf8::decode $_;
2122 /\.map$/
2123 ? normalise $_
2124 : ()
2125 } @{ aio_readdir $TMPDIR or [] }
2126 ]
2127}
2128
2129=item $maps = cf::map::random_maps
2130
2131Returns an arrayref with all map paths of currently instantiated and saved
2132random maps. May block.
2133
2134=cut
2135
2136sub random_maps() {
2137 [
2138 map {
2139 utf8::decode $_;
2140 /\.map$/
2141 ? normalise "?random/$_"
2142 : ()
2143 } @{ aio_readdir $RANDOMDIR or [] }
2144 ]
1663} 2145}
1664 2146
1665=item cf::map::unique_maps 2147=item cf::map::unique_maps
1666 2148
1667Returns an arrayref of paths of all shared maps that have 2149Returns an arrayref of paths of all shared maps that have
1668instantiated unique items. May block. 2150instantiated unique items. May block.
1669 2151
1670=cut 2152=cut
1671 2153
1672sub unique_maps() { 2154sub unique_maps() {
1673 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2155 [
1674 or return; 2156 map {
1675
1676 my @paths;
1677
1678 for (@$files) {
1679 utf8::decode $_; 2157 utf8::decode $_;
1680 next if /\.pst$/; 2158 /\.map$/
1681 next unless /^$PATH_SEP/o; 2159 ? normalise $_
1682 2160 : ()
1683 push @paths, cf::map::normalise $_; 2161 } @{ aio_readdir $UNIQUEDIR or [] }
1684 } 2162 ]
1685
1686 \@paths
1687} 2163}
1688 2164
1689package cf; 2165package cf;
1690 2166
1691=back 2167=back
1737 2213
1738 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2214 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1739 2215
1740 if ($self->{record_replies}) { 2216 if ($self->{record_replies}) {
1741 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2217 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2218
1742 } else { 2219 } else {
2220 my $pl = $self->contr;
2221
2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2223 my $dialog = $pl->{npc_dialog};
2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2225
2226 } else {
1743 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
1744 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2229 }
1745 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
1746} 2241}
1747 2242
1748=item $player_object->may ("access") 2243=item $player_object->may ("access")
1749 2244
1750Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
1797 $self->deactivate_recursive; 2292 $self->deactivate_recursive;
1798 2293
1799 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2294 return if UNIVERSAL::isa $self->map, "ext::map_link";
1800 2295
1801 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2296 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1802 if $self->map; 2297 if $self->map && $self->map->{path} ne "{link}";
1803 2298
1804 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2299 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1805} 2300}
1806 2301
1807sub cf::object::player::leave_link { 2302sub cf::object::player::leave_link {
1808 my ($self, $map, $x, $y) = @_; 2303 my ($self, $map, $x, $y) = @_;
2304
2305 return unless $self->contr->active;
1809 2306
1810 my $link_pos = delete $self->{_link_pos}; 2307 my $link_pos = delete $self->{_link_pos};
1811 2308
1812 unless ($map) { 2309 unless ($map) {
1813 # restore original map position 2310 # restore original map position
1827 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
1828 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
1829 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
1830 2327
1831 $map->load; 2328 $map->load;
1832 $map->load_diag; 2329 $map->load_neighbours;
1833 2330
1834 return unless $self->contr->active; 2331 return unless $self->contr->active;
1835 $self->activate_recursive; 2332 $self->activate_recursive;
1836 2333
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1838 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
1839} 2336}
1840 2337
1841cf::player->attach ( 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1842 on_logout => sub {
1843 my ($pl) = @_;
1844 2339
1845 # abort map switching before logout 2340Moves the player to the given map-path and coordinates by first freezing
1846 if ($pl->ob->{_link_pos}) { 2341her, loading and preparing them map, calling the provided $check callback
1847 cf::sync_job { 2342that has to return the map if sucecssful, and then unfreezes the player on
1848 $pl->ob->leave_link 2343the new (success) or old (failed) map position. In either case, $done will
1849 }; 2344be called at the end of this process.
1850 }
1851 },
1852 on_login => sub {
1853 my ($pl) = @_;
1854 2345
1855 # try to abort aborted map switching on player login :)
1856 # should happen only on crashes
1857 if ($pl->ob->{_link_pos}) {
1858 $pl->ob->enter_link;
1859 (async {
1860 $pl->ob->reply (undef,
1861 "There was an internal problem at your last logout, "
1862 . "the server will try to bring you to your intended destination in a second.",
1863 cf::NDI_RED);
1864 # we need this sleep as the login has a concurrent enter_exit running
1865 # and this sleep increases chances of the player not ending up in scorn
1866 Coro::Timer::sleep 1;
1867 $pl->ob->leave_link;
1868 })->prio (2);
1869 }
1870 },
1871);
1872
1873=item $player_object->goto ($path, $x, $y)
1874
1875=cut 2346=cut
2347
2348our $GOTOGEN;
1876 2349
1877sub cf::object::player::goto { 2350sub cf::object::player::goto {
1878 my ($self, $path, $x, $y) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2352
2353 # do generation counting so two concurrent goto's will be executed in-order
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1879 2355
1880 $self->enter_link; 2356 $self->enter_link;
1881 2357
1882 (async { 2358 (async {
1883 my $map = eval { 2359 my $map = eval {
1884 my $map = cf::map::find $path; 2360 my $map = cf::map::find $path;
2361
2362 if ($map) {
1885 $map = $map->customise_for ($self) if $map; 2363 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map;
2365 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2367 }
2368
1886 $map 2369 $map
2370 };
2371
2372 if ($@) {
2373 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2374 LOG llevError | logBacktrace, Carp::longmess $@;
1887 } or 2375 }
1888 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1889 2376
2377 if ($gen == $self->{_goto_generation}) {
2378 delete $self->{_goto_generation};
1890 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2380 }
2381
2382 $done->() if $done;
1891 })->prio (1); 2383 })->prio (1);
1892} 2384}
1893 2385
1894=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
1895 2387
1934 2426
1935 $rmp->{random_seed} ||= $exit->random_seed; 2427 $rmp->{random_seed} ||= $exit->random_seed;
1936 2428
1937 my $data = cf::to_json $rmp; 2429 my $data = cf::to_json $rmp;
1938 my $md5 = Digest::MD5::md5_hex $data; 2430 my $md5 = Digest::MD5::md5_hex $data;
1939 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2431 my $meta = "$RANDOMDIR/$md5.meta";
1940 2432
1941 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1942 aio_write $fh, 0, (length $data), $data, 0; 2434 aio_write $fh, 0, (length $data), $data, 0;
1943 undef $fh; 2435 undef $fh;
1944 aio_rename "$meta~", $meta; 2436 aio_rename "$meta~", $meta;
1953 2445
1954 return unless $self->type == cf::PLAYER; 2446 return unless $self->type == cf::PLAYER;
1955 2447
1956 if ($exit->slaying eq "/!") { 2448 if ($exit->slaying eq "/!") {
1957 #TODO: this should de-fi-ni-te-ly not be a sync-job 2449 #TODO: this should de-fi-ni-te-ly not be a sync-job
2450 # the problem is that $exit might not survive long enough
2451 # so it needs to be done right now, right here
1958 cf::sync_job { prepare_random_map $exit }; 2452 cf::sync_job { prepare_random_map $exit };
1959 } 2453 }
1960 2454
1961 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2455 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1962 my $hp = $exit->stats->hp; 2456 my $hp = $exit->stats->hp;
1963 my $sp = $exit->stats->sp; 2457 my $sp = $exit->stats->sp;
1964 2458
1965 $self->enter_link; 2459 $self->enter_link;
2460
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
1966 2464
1967 (async { 2465 (async {
1968 $self->deactivate_recursive; # just to be sure 2466 $self->deactivate_recursive; # just to be sure
1969 unless (eval { 2467 unless (eval {
1970 $self->goto ($slaying, $hp, $sp); 2468 $self->goto ($slaying, $hp, $sp);
1971 2469
1972 1; 2470 1;
1973 }) { 2471 }) {
1974 $self->message ("Something went wrong deep within the crossfire server. " 2472 $self->message ("Something went wrong deep within the crossfire server. "
1975 . "I'll try to bring you back to the map you were before. " 2473 . "I'll try to bring you back to the map you were before. "
1976 . "Please report this to the dungeon master!", 2474 . "Please report this to the dungeon master!",
1977 cf::NDI_UNIQUE | cf::NDI_RED); 2475 cf::NDI_UNIQUE | cf::NDI_RED);
1978 2476
1979 warn "ERROR in enter_exit: $@"; 2477 warn "ERROR in enter_exit: $@";
1980 $self->leave_link; 2478 $self->leave_link;
1981 } 2479 }
1982 })->prio (1); 2480 })->prio (1);
1995 2493
1996sub cf::client::send_drawinfo { 2494sub cf::client::send_drawinfo {
1997 my ($self, $text, $flags) = @_; 2495 my ($self, $text, $flags) = @_;
1998 2496
1999 utf8::encode $text; 2497 utf8::encode $text;
2000 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2001} 2499}
2002 2500
2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2502
2503Send a drawinfo or msg packet to the client, formatting the msg for the
2504client if neccessary. C<$type> should be a string identifying the type of
2505the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet.
2507
2508=cut
2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2525sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_;
2527
2528 $msg = $self->pl->expand_cfpod ($msg);
2529
2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2541 }
2542
2543 $channel = $channel->{id};
2544 }
2545
2546 return unless @extra || length $msg;
2547
2548 if ($self->can_msg) {
2549 # default colour, mask it out
2550 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2551 if $color & cf::NDI_DEF;
2552
2553 $self->send_packet ("msg " . $self->{json_coder}->encode (
2554 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2555 } else {
2556 if ($color >= 0) {
2557 # replace some tags by gcfclient-compatible ones
2558 for ($msg) {
2559 1 while
2560 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2561 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2562 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2563 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2564 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2565 }
2566
2567 $color &= cf::NDI_COLOR_MASK;
2568
2569 utf8::encode $msg;
2570
2571 if (0 && $msg =~ /\[/) {
2572 # COMMAND/INFO
2573 $self->send_packet ("drawextinfo $color 10 8 $msg")
2574 } else {
2575 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2576 $self->send_packet ("drawinfo $color $msg")
2577 }
2578 }
2579 }
2580}
2581
2582=item $client->ext_msg ($type, @msg)
2583
2584Sends an ext event to the client.
2585
2586=cut
2587
2588sub cf::client::ext_msg($$@) {
2589 my ($self, $type, @msg) = @_;
2590
2591 if ($self->extcmd == 2) {
2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2593 } elsif ($self->extcmd == 1) { # TODO: remove
2594 push @msg, msgtype => "event_$type";
2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2596 }
2597}
2598
2599=item $client->ext_reply ($msgid, @msg)
2600
2601Sends an ext reply to the client.
2602
2603=cut
2604
2605sub cf::client::ext_reply($$@) {
2606 my ($self, $id, @msg) = @_;
2607
2608 if ($self->extcmd == 2) {
2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2610 } elsif ($self->extcmd == 1) {
2611 #TODO: version 1, remove
2612 unshift @msg, msgtype => "reply", msgid => $id;
2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2614 }
2615}
2003 2616
2004=item $success = $client->query ($flags, "text", \&cb) 2617=item $success = $client->query ($flags, "text", \&cb)
2005 2618
2006Queues a query to the client, calling the given callback with 2619Queues a query to the client, calling the given callback with
2007the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2620the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2008C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2621C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2009 2622
2010Queries can fail, so check the return code. Or don't, as queries will become 2623Queries can fail, so check the return code. Or don't, as queries will
2011reliable at some point in the future. 2624become reliable at some point in the future.
2012 2625
2013=cut 2626=cut
2014 2627
2015sub cf::client::query { 2628sub cf::client::query {
2016 my ($self, $flags, $text, $cb) = @_; 2629 my ($self, $flags, $text, $cb) = @_;
2024 utf8::encode $text; 2637 utf8::encode $text;
2025 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2638 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2026 2639
2027 $self->send_packet ($self->{query_queue}[0][0]) 2640 $self->send_packet ($self->{query_queue}[0][0])
2028 if @{ $self->{query_queue} } == 1; 2641 if @{ $self->{query_queue} } == 1;
2642
2643 1
2029} 2644}
2030 2645
2031cf::client->attach ( 2646cf::client->attach (
2647 on_connect => sub {
2648 my ($ns) = @_;
2649
2650 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2651 },
2032 on_reply => sub { 2652 on_reply => sub {
2033 my ($ns, $msg) = @_; 2653 my ($ns, $msg) = @_;
2034 2654
2035 # this weird shuffling is so that direct followup queries 2655 # this weird shuffling is so that direct followup queries
2036 # get handled first 2656 # get handled first
2048 } else { 2668 } else {
2049 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2669 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2050 } 2670 }
2051 } 2671 }
2052 }, 2672 },
2673 on_exticmd => sub {
2674 my ($ns, $buf) = @_;
2675
2676 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2677
2678 if (ref $msg) {
2679 my ($type, $reply, @payload) =
2680 "ARRAY" eq ref $msg
2681 ? @$msg
2682 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2683
2684 my @reply;
2685
2686 if (my $cb = $EXTICMD{$type}) {
2687 @reply = $cb->($ns, @payload);
2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2693 } else {
2694 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2695 }
2696
2697 cf::override;
2698 },
2053); 2699);
2054 2700
2055=item $client->async (\&cb) 2701=item $client->async (\&cb)
2056 2702
2057Create a new coroutine, running the specified callback. The coroutine will 2703Create a new coroutine, running the specified callback. The coroutine will
2098our $safe = new Safe "safe"; 2744our $safe = new Safe "safe";
2099our $safe_hole = new Safe::Hole; 2745our $safe_hole = new Safe::Hole;
2100 2746
2101$SIG{FPE} = 'IGNORE'; 2747$SIG{FPE} = 'IGNORE';
2102 2748
2103$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2749$safe->permit_only (Opcode::opset qw(
2750 :base_core :base_mem :base_orig :base_math
2751 grepstart grepwhile mapstart mapwhile
2752 sort time
2753));
2104 2754
2105# here we export the classes and methods available to script code 2755# here we export the classes and methods available to script code
2106 2756
2107=pod 2757=pod
2108 2758
2109The following fucntions and emthods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2110 2760
2111 cf::object contr pay_amount pay_player map 2761 cf::object
2762 contr pay_amount pay_player map x y force_find force_add
2763 insert remove name archname title slaying race decrease_ob_nr
2764
2112 cf::object::player player 2765 cf::object::player
2113 cf::player peaceful 2766 player
2114 cf::map trigger 2767
2768 cf::player
2769 peaceful
2770
2771 cf::map
2772 trigger
2115 2773
2116=cut 2774=cut
2117 2775
2118for ( 2776for (
2119 ["cf::object" => qw(contr pay_amount pay_player map)], 2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2778 insert remove inv name archname title slaying race
2779 decrease_ob_nr)],
2120 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2121 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2122 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2123) { 2783) {
2124 no strict 'refs'; 2784 no strict 'refs';
2195=back 2855=back
2196 2856
2197=cut 2857=cut
2198 2858
2199############################################################################# 2859#############################################################################
2200
2201=head2 EXTENSION DATABASE SUPPORT
2202
2203Crossfire maintains a very simple database for extension use. It can
2204currently store anything that can be serialised using Storable, which
2205excludes objects.
2206
2207The parameter C<$family> should best start with the name of the extension
2208using it, it should be unique.
2209
2210=over 4
2211
2212=item $value = cf::db_get $family => $key
2213
2214Returns a single value from the database.
2215
2216=item cf::db_put $family => $key => $value
2217
2218Stores the given C<$value> in the family.
2219
2220=cut
2221
2222our $DB;
2223
2224sub db_init {
2225 unless ($DB) {
2226 $DB = BDB::db_create $DB_ENV;
2227
2228 cf::sync_job {
2229 eval {
2230 $DB->set_flags (BDB::CHKSUM);
2231
2232 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2233 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2234 cf::cleanup "db_open(db): $!" if $!;
2235 };
2236 cf::cleanup "db_open(db): $@" if $@;
2237 };
2238
2239 my $path = cf::localdir . "/database.pst";
2240 if (stat $path) {
2241 cf::sync_job {
2242 my $pst = Storable::retrieve $path;
2243
2244 cf::db_put (board => data => $pst->{board});
2245 cf::db_put (guildrules => data => $pst->{guildrules});
2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2248
2249 unlink $path;
2250 };
2251 }
2252 }
2253}
2254
2255sub db_get($$) {
2256 my $key = "$_[0]/$_[1]";
2257
2258 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data;
2260
2261 $! ? ()
2262 : Compress::LZF::sthaw $data
2263 }
2264}
2265
2266sub db_put($$$) {
2267 BDB::dbreq_pri 4;
2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2269}
2270
2271#############################################################################
2272# the server's init and main functions 2860# the server's init and main functions
2273 2861
2274sub load_faces { 2862sub load_facedata($) {
2275 my $path = sprintf "%s/faces", cf::datadir; 2863 my ($path) = @_;
2276 2864
2865 # HACK to clear player env face cache, we need some signal framework
2866 # for this (global event?)
2867 %ext::player_env::MUSIC_FACE_CACHE = ();
2868
2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2870
2277 warn "loading faces from $path\n"; 2871 warn "loading facedata from $path\n";
2278 2872
2279 my $faces; 2873 my $facedata;
2280 0 < aio_load $path, $faces 2874 0 < aio_load $path, $facedata
2281 or die "$path: $!"; 2875 or die "$path: $!";
2282 2876
2283 Coro::cede;
2284 $faces = Storable::thaw $faces; 2877 $facedata = Coro::Storable::thaw $facedata;
2285 Coro::cede;
2286 2878
2879 $facedata->{version} == 2
2880 or cf::cleanup "$path: version mismatch, cannot proceed.";
2881
2882 # patch in the exptable
2883 $facedata->{resource}{"res/exp_table"} = {
2884 type => FT_RSRC,
2885 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2886 };
2887 cf::cede_to_tick;
2888
2889 {
2890 my $faces = $facedata->{faceinfo};
2891
2287 while (my ($face, $info) = each %$faces) { 2892 while (my ($face, $info) = each %$faces) {
2288 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2893 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2289 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2894 cf::face::set_visibility $idx, $info->{visibility};
2895 cf::face::set_magicmap $idx, $info->{magicmap};
2290 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2291 Coro::cede; 2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2898
2899 cf::cede_to_tick;
2900 }
2901
2902 while (my ($face, $info) = each %$faces) {
2903 next unless $info->{smooth};
2904 my $idx = cf::face::find $face
2905 or next;
2906 if (my $smooth = cf::face::find $info->{smooth}) {
2907 cf::face::set_smooth $idx, $smooth;
2908 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2909 } else {
2910 warn "smooth face '$info->{smooth}' not found for face '$face'";
2911 }
2912
2913 cf::cede_to_tick;
2914 }
2915 }
2916
2917 {
2918 my $anims = $facedata->{animinfo};
2919
2920 while (my ($anim, $info) = each %$anims) {
2921 cf::anim::set $anim, $info->{frames}, $info->{facings};
2922 cf::cede_to_tick;
2923 }
2924
2925 cf::anim::invalidate_all; # d'oh
2926 }
2927
2928 {
2929 # TODO: for gcfclient pleasure, we should give resources
2930 # that gcfclient doesn't grok a >10000 face index.
2931 my $res = $facedata->{resource};
2932
2933 my $soundconf = delete $res->{"res/sound.conf"};
2934
2935 while (my ($name, $info) = each %$res) {
2936 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data;
2938
2939 if ($info->{type} & 1) {
2940 # prepend meta info
2941
2942 my $meta = $enc->encode ({
2943 name => $name,
2944 %{ $info->{meta} || {} },
2945 });
2946
2947 $data = pack "(w/a*)*", $meta, $info->{data};
2948 } else {
2949 $data = $info->{data};
2950 }
2951
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2953 cf::face::set_type $idx, $info->{type};
2954
2955 cf::cede_to_tick;
2956 }
2957
2958 if ($soundconf) {
2959 $soundconf = $enc->decode (delete $soundconf->{data});
2960
2961 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2962 my $sound = $soundconf->{compat}[$_]
2963 or next;
2964
2965 my $face = cf::face::find "sound/$sound->[1]";
2966 cf::sound::set $sound->[0] => $face;
2967 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2968 }
2969
2970 while (my ($k, $v) = each %{$soundconf->{event}}) {
2971 my $face = cf::face::find "sound/$v";
2972 cf::sound::set $k => $face;
2973 }
2974 }
2292 } 2975 }
2293 2976
2294 1 2977 1
2295} 2978}
2296 2979
2980register_exticmd fx_want => sub {
2981 my ($ns, $want) = @_;
2982
2983 while (my ($k, $v) = each %$want) {
2984 $ns->fx_want ($k, $v);
2985 }
2986};
2987
2988sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2993 load_resource_file "$MAPDIR/regions"
2994 or die "unable to load regions file\n";
2995
2996 for (cf::region::list) {
2997 $_->{match} = qr/$_->{match}/
2998 if exists $_->{match};
2999 }
3000}
3001
3002sub reload_facedata {
3003 load_facedata "$DATADIR/facedata"
3004 or die "unable to load facedata\n";
3005}
3006
3007sub reload_archetypes {
3008 load_resource_file "$DATADIR/archetypes"
3009 or die "unable to load archetypes\n";
3010 #d# NEED to laod twice to resolve forward references
3011 # this really needs to be done in an extra post-pass
3012 # (which needs to be synchronous, so solve it differently)
3013 load_resource_file "$DATADIR/archetypes"
3014 or die "unable to load archetypes\n";
3015}
3016
3017sub reload_treasures {
3018 load_resource_file "$DATADIR/treasures"
3019 or die "unable to load treasurelists\n";
3020}
3021
2297sub reload_resources { 3022sub reload_resources {
2298 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3023 warn "reloading resource files...\n";
2299 or die "unable to load regions file\n";#d# 3024
3025 reload_regions;
2300 load_faces 3026 reload_facedata;
2301 or die "unable to load faces\n";#d# 3027 #reload_archetypes;#d#
3028 reload_archetypes;
3029 reload_treasures;
3030
3031 warn "finished reloading resource files\n";
2302} 3032}
2303 3033
2304sub init { 3034sub init {
2305 reload_resources; 3035 reload_resources;
2306} 3036}
2307 3037
2308sub cfg_load { 3038sub reload_config {
2309 open my $fh, "<:utf8", cf::confdir . "/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
2310 or return; 3040 or return;
2311 3041
2312 local $/; 3042 local $/;
2313 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
2314 3044
2333 (async { 3063 (async {
2334 Event::one_event; 3064 Event::one_event;
2335 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
2336 }; 3066 };
2337 3067
2338 cfg_load; 3068 reload_config;
2339 db_init; 3069 db_init;
2340 load_extensions; 3070 load_extensions;
2341 3071
2342 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
2343 Event::loop; 3073 Event::loop;
2359 }, 3089 },
2360 ); 3090 );
2361 } 3091 }
2362} 3092}
2363 3093
3094sub write_runtime {
3095 my $runtime = "$LOCALDIR/runtime";
3096
3097 # first touch the runtime file to show we are still running:
3098 # the fsync below can take a very very long time.
3099
3100 IO::AIO::aio_utime $runtime, undef, undef;
3101
3102 my $guard = cf::lock_acquire "write_runtime";
3103
3104 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3105 or return;
3106
3107 my $value = $cf::RUNTIME + 90 + 10;
3108 # 10 is the runtime save interval, for a monotonic clock
3109 # 60 allows for the watchdog to kill the server.
3110
3111 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3112 and return;
3113
3114 # always fsync - this file is important
3115 aio_fsync $fh
3116 and return;
3117
3118 # touch it again to show we are up-to-date
3119 aio_utime $fh, undef, undef;
3120
3121 close $fh
3122 or return;
3123
3124 aio_rename "$runtime~", $runtime
3125 and return;
3126
3127 warn "runtime file written.\n";
3128
3129 1
3130}
3131
2364sub emergency_save() { 3132sub emergency_save() {
2365 my $freeze_guard = cf::freeze_mainloop; 3133 my $freeze_guard = cf::freeze_mainloop;
2366 3134
2367 warn "enter emergency perl save\n"; 3135 warn "enter emergency perl save\n";
2368 3136
2399 3167
2400 warn Carp::longmess "post_cleanup backtrace" 3168 warn Carp::longmess "post_cleanup backtrace"
2401 if $make_core; 3169 if $make_core;
2402} 3170}
2403 3171
2404sub reload() { 3172sub do_reload_perl() {
2405 # can/must only be called in main 3173 # can/must only be called in main
2406 if ($Coro::current != $Coro::main) { 3174 if ($Coro::current != $Coro::main) {
2407 warn "can only reload from main coroutine"; 3175 warn "can only reload from main coroutine";
2408 return; 3176 return;
2409 } 3177 }
2443 %EXT_CORO = (); 3211 %EXT_CORO = ();
2444 3212
2445 warn "removing commands"; 3213 warn "removing commands";
2446 %COMMAND = (); 3214 %COMMAND = ();
2447 3215
2448 warn "removing ext commands"; 3216 warn "removing ext/exti commands";
2449 %EXTCMD = (); 3217 %EXTCMD = ();
3218 %EXTICMD = ();
2450 3219
2451 warn "unloading/nuking all extensions"; 3220 warn "unloading/nuking all extensions";
2452 for my $pkg (@EXTS) { 3221 for my $pkg (@EXTS) {
2453 warn "... unloading $pkg"; 3222 warn "... unloading $pkg";
2454 3223
2484 Symbol::delete_package "safe::$_" 3253 Symbol::delete_package "safe::$_"
2485 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3254 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2486 3255
2487 warn "unloading cf.pm \"a bit\""; 3256 warn "unloading cf.pm \"a bit\"";
2488 delete $INC{"cf.pm"}; 3257 delete $INC{"cf.pm"};
3258 delete $INC{"cf/pod.pm"};
2489 3259
2490 # don't, removes xs symbols, too, 3260 # don't, removes xs symbols, too,
2491 # and global variables created in xs 3261 # and global variables created in xs
2492 #Symbol::delete_package __PACKAGE__; 3262 #Symbol::delete_package __PACKAGE__;
2493 3263
2496 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
2497 require cf; 3267 require cf;
2498 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2499 3269
2500 warn "loading config and database again"; 3270 warn "loading config and database again";
2501 cf::cfg_load; 3271 cf::reload_config;
2502 3272
2503 warn "loading extensions"; 3273 warn "loading extensions";
2504 cf::load_extensions; 3274 cf::load_extensions;
2505 3275
2506 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";
2508 warn "reattaching attachments to maps"; 3278 warn "reattaching attachments to maps";
2509 reattach $_ for values %MAP; 3279 reattach $_ for values %MAP;
2510 warn "reattaching attachments to players"; 3280 warn "reattaching attachments to players";
2511 reattach $_ for values %PLAYER; 3281 reattach $_ for values %PLAYER;
2512 3282
2513 warn "loading reloadable resources";
2514 reload_resources;
2515
2516 warn "leaving sync_job"; 3283 warn "leaving sync_job";
2517 3284
2518 1 3285 1
2519 } or do { 3286 } or do {
2520 warn $@; 3287 warn $@;
2525 warn "reloaded"; 3292 warn "reloaded";
2526}; 3293};
2527 3294
2528our $RELOAD_WATCHER; # used only during reload 3295our $RELOAD_WATCHER; # used only during reload
2529 3296
3297sub reload_perl() {
3298 # doing reload synchronously and two reloads happen back-to-back,
3299 # coro crashes during coro_state_free->destroy here.
3300
3301 $RELOAD_WATCHER ||= Event->timer (
3302 reentrant => 0,
3303 after => 0,
3304 data => WF_AUTOCANCEL,
3305 cb => sub {
3306 do_reload_perl;
3307 undef $RELOAD_WATCHER;
3308 },
3309 );
3310}
3311
2530register_command "reload" => sub { 3312register_command "reload" => sub {
2531 my ($who, $arg) = @_; 3313 my ($who, $arg) = @_;
2532 3314
2533 if ($who->flag (FLAG_WIZ)) { 3315 if ($who->flag (FLAG_WIZ)) {
2534 $who->message ("reloading server."); 3316 $who->message ("reloading server.");
2535 3317 async { reload_perl };
2536 # doing reload synchronously and two reloads happen back-to-back,
2537 # coro crashes during coro_state_free->destroy here.
2538
2539 $RELOAD_WATCHER ||= Event->timer (
2540 reentrant => 0,
2541 after => 0,
2542 data => WF_AUTOCANCEL,
2543 cb => sub {
2544 reload;
2545 undef $RELOAD_WATCHER;
2546 },
2547 );
2548 } 3318 }
2549}; 3319};
2550 3320
2551unshift @INC, $LIBDIR; 3321unshift @INC, $LIBDIR;
2552 3322
2553my $bug_warning = 0; 3323my $bug_warning = 0;
2554 3324
3325our @WAIT_FOR_TICK;
3326our @WAIT_FOR_TICK_BEGIN;
3327
3328sub wait_for_tick {
3329 return unless $TICK_WATCHER->is_active;
3330 return if $Coro::current == $Coro::main;
3331
3332 my $signal = new Coro::Signal;
3333 push @WAIT_FOR_TICK, $signal;
3334 $signal->wait;
3335}
3336
3337sub wait_for_tick_begin {
3338 return unless $TICK_WATCHER->is_active;
3339 return if $Coro::current == $Coro::main;
3340
3341 my $signal = new Coro::Signal;
3342 push @WAIT_FOR_TICK_BEGIN, $signal;
3343 $signal->wait;
3344}
3345
3346 my $min = 1e6;#d#
3347 my $avg = 10;
2555$TICK_WATCHER = Event->timer ( 3348$TICK_WATCHER = Event->timer (
2556 reentrant => 0, 3349 reentrant => 0,
2557 parked => 1, 3350 parked => 1,
2558 prio => 0, 3351 prio => 0,
2559 at => $NEXT_TICK || $TICK, 3352 at => $NEXT_TICK || $TICK,
2563 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3356 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2564 unless ++$bug_warning > 10; 3357 unless ++$bug_warning > 10;
2565 return; 3358 return;
2566 } 3359 }
2567 3360
2568 $NOW = Event::time; 3361 $NOW = $tick_start = Event::time;
2569 3362
2570 cf::server_tick; # one server iteration 3363 cf::server_tick; # one server iteration
3364
3365 0 && sync_job {#d#
3366 for(1..10) {
3367 my $t = Event::time;
3368 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3369 or die;
3370
3371 $map->width (50);
3372 $map->height (50);
3373 $map->alloc;
3374 $map->_load_objects ("/tmp/x.map", 1);
3375 my $t = Event::time - $t;
3376
3377 #next unless $t < 0.0013;#d#
3378 if ($t < $min) {
3379 $min = $t;
3380 }
3381 $avg = $avg * 0.99 + $t * 0.01;
3382 }
3383 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3384 exit 0;
3385 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3386 };
3387
2571 $RUNTIME += $TICK; 3388 $RUNTIME += $TICK;
2572 $NEXT_TICK += $TICK; 3389 $NEXT_TICK += $TICK;
2573 3390
2574 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3391 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2575 $NEXT_RUNTIME_WRITE = $NOW + 10; 3392 $NEXT_RUNTIME_WRITE = $NOW + 10;
2577 write_runtime 3394 write_runtime
2578 or warn "ERROR: unable to write runtime file: $!"; 3395 or warn "ERROR: unable to write runtime file: $!";
2579 }; 3396 };
2580 } 3397 }
2581 3398
2582 $WAIT_FOR_TICK->broadcast;
2583 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2584
2585# my $AFTER = Event::time; 3399# my $AFTER = Event::time;
2586# warn $AFTER - $NOW;#d# 3400# warn $AFTER - $NOW;#d#
2587 3401
3402 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3403 $sig->send;
3404 }
3405 while (my $sig = shift @WAIT_FOR_TICK) {
3406 $sig->send;
3407 }
3408
3409 $NOW = Event::time;
3410
2588 # if we are delayed by four ticks or more, skip them all 3411 # if we are delayed by four ticks or more, skip them all
2589 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3412 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2590 3413
2591 $TICK_WATCHER->at ($NEXT_TICK); 3414 $TICK_WATCHER->at ($NEXT_TICK);
2592 $TICK_WATCHER->start; 3415 $TICK_WATCHER->start;
3416
3417 $LOAD = ($NOW - $tick_start) / $TICK;
3418 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3419
3420 _post_tick;
3421
3422
2593 }, 3423 },
2594); 3424);
2595 3425
2596{ 3426{
2597 BDB::max_poll_time $TICK * 0.1; 3427 BDB::max_poll_time $TICK * 0.1;
2625 3455
2626 cf::sync_job { 3456 cf::sync_job {
2627 eval { 3457 eval {
2628 BDB::db_env_open 3458 BDB::db_env_open
2629 $DB_ENV, 3459 $DB_ENV,
2630 $BDB_ENV_DIR, 3460 $BDBDIR,
2631 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3461 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2632 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3462 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2633 0666; 3463 0666;
2634 3464
2635 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3465 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2636 3466
2637 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3467 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2638 $DB_ENV->set_lk_detect; 3468 $DB_ENV->set_lk_detect;
2639 }; 3469 };
2640 3470
2656 prio => 6, 3486 prio => 6,
2657 cb => \&IO::AIO::poll_cb, 3487 cb => \&IO::AIO::poll_cb,
2658 ); 3488 );
2659} 3489}
2660 3490
3491my $_log_backtrace;
3492
3493sub _log_backtrace {
3494 my ($msg, @addr) = @_;
3495
3496 $msg =~ s/\n//;
3497
3498 # limit the # of concurrent backtraces
3499 if ($_log_backtrace < 2) {
3500 ++$_log_backtrace;
3501 async {
3502 my @bt = fork_call {
3503 @addr = map { sprintf "%x", $_ } @addr;
3504 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3505 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3506 or die "addr2line: $!";
3507
3508 my @funcs;
3509 my @res = <$fh>;
3510 chomp for @res;
3511 while (@res) {
3512 my ($func, $line) = splice @res, 0, 2, ();
3513 push @funcs, "[$func] $line";
3514 }
3515
3516 @funcs
3517 };
3518
3519 LOG llevInfo, "[ABT] $msg\n";
3520 LOG llevInfo, "[ABT] $_\n" for @bt;
3521 --$_log_backtrace;
3522 };
3523 } else {
3524 LOG llevInfo, "[ABT] $msg\n";
3525 LOG llevInfo, "[ABT] [suppressed]\n";
3526 }
3527}
3528
3529# load additional modules
3530use cf::pod;
3531
2661END { cf::emergency_save } 3532END { cf::emergency_save }
2662 3533
26631 35341
2664 3535

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines