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.239 by root, Mon Apr 16 06:23:42 2007 UTC vs.
Revision 1.348 by root, Thu Aug 30 08:34:40 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.64 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
21use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
22 25
26use JSON::XS ();
23use BDB (); 27use BDB ();
24use Data::Dumper; 28use Data::Dumper;
25use Digest::MD5; 29use Digest::MD5;
26use Fcntl; 30use Fcntl;
27use YAML::Syck (); 31use YAML::Syck ();
28use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
29use Time::HiRes; 33use Time::HiRes;
30use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
31 36
32# configure various modules to our taste 37# configure various modules to our taste
33# 38#
34$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
47our %COMMAND = (); 52our %COMMAND = ();
48our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
49 54
50our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
51our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
52our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
54 60
55our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
56our @EVENT; 62our @EVENT;
57our $LIBDIR = datadir . "/ext";
58 63
59our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 77our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 80our $NEXT_TICK;
64our $NOW; 81our $NOW;
73our $RUNTIME; 90our $RUNTIME;
74 91
75our %PLAYER; # all users 92our %PLAYER; # all users
76our %MAP; # all maps 93our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80 95
81# 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 ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 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
84binmode STDOUT; 103binmode STDOUT;
85binmode STDERR; 104binmode STDERR;
86 105
87# read virtual server time, if available 106# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
92} 111}
93 112
94mkdir cf::localdir; 113mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
96mkdir cf::localdir . "/" . cf::tmpdir;
97mkdir cf::localdir . "/" . cf::uniquedir;
98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
100 115
101our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
102 117
103sub cf::map::normalise; 118sub cf::map::normalise;
104 119
115=item $cf::RUNTIME 130=item $cf::RUNTIME
116 131
117The 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
118every server tick. 133every server tick.
119 134
120=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
121 138
122The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
123be 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.
124 143
125=item $cf::NOW 144=item $cf::NOW
126 145
127The time of the last (current) server tick. 146The time of the last (current) server tick.
128 147
129=item $cf::TICK 148=item $cf::TICK
130 149
131The 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.
132 161
133=item %cf::CFG 162=item %cf::CFG
134 163
135Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
136from wherever your confdir points to. 165from wherever your confdir points to.
139 168
140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
141returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
142per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
143 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.
178
144=back 179=back
145 180
146=cut 181=cut
147 182
148BEGIN { 183BEGIN {
149 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 185 my $msg = join "", @_;
151 utf8::encode $msg;
152 186
153 $msg .= "\n" 187 $msg .= "\n"
154 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
155 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
156 LOG llevError, $msg; 193 LOG llevError, $msg;
157 }; 194 };
158} 195}
159 196
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@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';
165@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)
166 204
167# 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
168# within the Safe compartment. 206# within the Safe compartment.
169for my $pkg (qw( 207for my $pkg (qw(
170 cf::global cf::attachable 208 cf::global cf::attachable
178} 216}
179 217
180$Event::DIED = sub { 218$Event::DIED = sub {
181 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
182}; 220};
221
222#############################################################################
183 223
184=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
185 225
186=over 4 226=over 4
187 227
206 $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;
207 $d 247 $d
208 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
209} 249}
210 250
211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
212
213=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
214 252
215Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
216 254
217=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
218 256
219Converts 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]) }
220 265
221=item cf::lock_wait $string 266=item cf::lock_wait $string
222 267
223Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
224 269
227Wait 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
228a 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,
229for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
230returned. 275returned.
231 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
232Lock 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
233uses 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.
234 286
235=cut 287=cut
236 288
237our %LOCK; 289our %LOCK;
238 290
256 308
257 Coro::guard { 309 Coro::guard {
258 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
260 } 312 }
313}
314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
261} 319}
262 320
263sub freeze_mainloop { 321sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
265 323
268 }; 326 };
269 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
270 $guard 328 $guard
271} 329}
272 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
273=item cf::async { BLOCK } 387=item cf::async { BLOCK }
274 388
275Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
276C<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
277thing you are allowed to do is call C<prio> on it. 391thing you are allowed to do is call C<prio> on it.
280 394
281BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
282 396
283=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
284 398
285The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
287reentrant. 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.
288 403
289If 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
290the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
291server 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
292fast or be very important. 407fast or be very important.
295 410
296sub sync_job(&) { 411sub sync_job(&) {
297 my ($job) = @_; 412 my ($job) = @_;
298 413
299 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
300 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
302 419
303 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 421 # (but this is cancel-safe)
315 432
316 while ($busy) { 433 while ($busy) {
317 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
318 } 435 }
319 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
320 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
321 } else { 445 } else {
322 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
323 447
324 $job->() 448 $job->()
343 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
344 468
345 $coro 469 $coro
346} 470}
347 471
348sub write_runtime { 472=item fork_call { }, $args
349 my $guard = cf::lock_acquire "write_runtime";
350 473
351 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.
352 478
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479=cut
354 or return;
355 480
356 my $value = $cf::RUNTIME + 90 + 10; 481sub fork_call(&@) {
357 # 10 is the runtime save interval, for a monotonic clock 482 my ($cb, @args) = @_;
358 # 60 allows for the watchdog to kill the server.
359 483
360 (aio_write $fh, 0, (length $value), $value, 0) <= 0 484 # we seemingly have to make a local copy of the whole thing,
361 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious)
362 487
363 # always fsync - this file is important 488 my @res = Coro::Util::fork_eval {
364 aio_fsync $fh 489 reset_signals;
365 and return; 490 &$cb
491 }, @args;
366 492
367 close $fh 493 wantarray ? @res : $res[-1]
368 or return; 494}
369 495
370 aio_rename "$runtime~", $runtime 496=item $value = cf::db_get $family => $key
371 and return;
372 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 };
373 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"
374} 610}
375 611
376=item cf::datalog type => key => value, ... 612=item cf::datalog type => key => value, ...
377 613
378Log 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.
396attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
397to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
398 634
399In 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>
400C<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
401crossfire+). 637Crossfire TRT).
402 638
403=over 4 639=over 4
404 640
405=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
406 642
569 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
570 806
571 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 811
576 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 813 my $pkg = shift @arg;
578 814
579 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
608 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
609 } 845 }
610 846
611 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
612 } else { 848 } else {
613 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
614 } 850 }
615 851
616 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
617} 853}
618 854
620 if (ref $_[0]) { 856 if (ref $_[0]) {
621 _object_attach @_; 857 _object_attach @_;
622 } else { 858 } else {
623 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
624 } 860 }
861 _recalc_want;
625}; 862};
626 863
627# all those should be optimised 864# all those should be optimised
628sub cf::attachable::detach { 865sub cf::attachable::detach {
629 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
632 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
633 reattach ($obj); 870 reattach ($obj);
634 } else { 871 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
636 } 873 }
874 _recalc_want;
637}; 875};
638 876
639sub cf::attachable::attached { 877sub cf::attachable::attached {
640 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
641 879
656 "; 894 ";
657 die if $@; 895 die if $@;
658} 896}
659 897
660our $override; 898our $override;
661our @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?
662 900
663sub override { 901sub override {
664 $override = 1; 902 $override = 1;
665 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
666} 904}
667 905
668sub do_invoke { 906sub do_invoke {
669 my $event = shift; 907 my $event = shift;
670 my $callbacks = shift; 908 my $callbacks = shift;
671 909
672 @invoke_results = (); 910 @INVOKE_RESULTS = ();
673 911
674 local $override; 912 local $override;
675 913
676 for (@$callbacks) { 914 for (@$callbacks) {
677 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
694 932
695Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
696 934
697This 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
698removed 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
699results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
700 938
701=back 939=back
702 940
703=cut 941=cut
704 942
705############################################################################# 943#############################################################################
706# 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}
707 956
708sub reattach { 957sub reattach {
709 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
710 my ($obj) = @_; 959 my ($obj) = @_;
711 960
814 or return; 1063 or return;
815 $av = eval { (Storable::thaw $av)->{objs} }; 1064 $av = eval { (Storable::thaw $av)->{objs} };
816 } 1065 }
817 1066
818 warn sprintf "loading %s (%d)\n", 1067 warn sprintf "loading %s (%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 1068 $filename, length $data, scalar @{$av || []};
820 return ($data, $av); 1069 return ($data, $av);
821} 1070}
1071
1072=head2 COMMAND CALLBACKS
1073
1074=over 4
1075
1076=cut
822 1077
823############################################################################# 1078#############################################################################
824# command handling &c 1079# command handling &c
825 1080
826=item cf::register_command $name => \&callback($ob,$args); 1081=item cf::register_command $name => \&callback($ob,$args);
839 push @{ $COMMAND{$name} }, [$caller, $cb]; 1094 push @{ $COMMAND{$name} }, [$caller, $cb];
840} 1095}
841 1096
842=item cf::register_extcmd $name => \&callback($pl,$packet); 1097=item cf::register_extcmd $name => \&callback($pl,$packet);
843 1098
844Register 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.
845 1104
846If 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
847called. 1106called.
848 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
849=cut 1119=cut
850 1120
851sub register_extcmd { 1121sub register_extcmd {
852 my ($name, $cb) = @_; 1122 my ($name, $cb) = @_;
853 1123
854 $EXTCMD{$name} = $cb; 1124 $EXTCMD{$name} = $cb;
1125}
1126
1127sub register_exticmd {
1128 my ($name, $cb) = @_;
1129
1130 $EXTICMD{$name} = $cb;
855} 1131}
856 1132
857cf::player->attach ( 1133cf::player->attach (
858 on_command => sub { 1134 on_command => sub {
859 my ($pl, $name, $params) = @_; 1135 my ($pl, $name, $params) = @_;
868 cf::override; 1144 cf::override;
869 }, 1145 },
870 on_extcmd => sub { 1146 on_extcmd => sub {
871 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
872 1148
873 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
874 1150
875 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
876 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
877 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
878 $pl->ext_reply ($msg->{msgid}, %reply);
879 }
880 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
881 } else { 1166 } else {
882 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
883 } 1168 }
884 1169
885 cf::override; 1170 cf::override;
886 }, 1171 },
887); 1172);
888 1173
889sub load_extension {
890 my ($path) = @_;
891
892 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
893 my $base = $1;
894 my $pkg = $1;
895 $pkg =~ s/[^[:word:]]/_/g;
896 $pkg = "ext::$pkg";
897
898 warn "... loading '$path' into '$pkg'\n";
899
900 open my $fh, "<:utf8", $path
901 or die "$path: $!";
902
903 my $source =
904 "package $pkg; use strict; use utf8;\n"
905 . "#line 1 \"$path\"\n{\n"
906 . (do { local $/; <$fh> })
907 . "\n};\n1";
908
909 unless (eval $source) {
910 my $msg = $@ ? "$path: $@\n"
911 : "extension disabled.\n";
912 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
913 warn $@;
914 warn "mandatory extension failed to load, exiting.\n";
915 exit 1;
916 }
917 die $@;
918 }
919
920 push @EXTS, $pkg;
921}
922
923sub load_extensions { 1174sub load_extensions {
1175 cf::sync_job {
1176 my %todo;
1177
924 for my $ext (<$LIBDIR/*.ext>) { 1178 for my $path (<$LIBDIR/*.ext>) {
925 next unless -r $ext; 1179 next unless -r $path;
926 eval { 1180
927 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;
928 1 1238 }
929 } or warn "$ext not loaded: $@"; 1239
1240 skip:
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1242 unless $progress;
1243 }
930 } 1244 };
931} 1245}
932 1246
933############################################################################# 1247#############################################################################
934 1248
1249=back
1250
935=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
936 1252
937Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
938 1254
939=cut 1255=cut
951Returns the given player object, loading it if necessary (might block). 1267Returns the given player object, loading it if necessary (might block).
952 1268
953=cut 1269=cut
954 1270
955sub playerdir($) { 1271sub playerdir($) {
956 cf::localdir 1272 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1273 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1274}
962 1275
963sub path($) { 1276sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1277 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1012 1325
1013 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1014 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1015 1328
1016 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1017 Coro::cede; 1330 cf::cede_to_tick;
1018} 1331}
1019 1332
1020sub new($) { 1333sub new($) {
1021 my ($login) = @_; 1334 my ($login) = @_;
1022 1335
1026 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1027 1340
1028 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1029 1342
1030 $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 (@_);
1031} 1354}
1032 1355
1033=item $pl->quit_character 1356=item $pl->quit_character
1034 1357
1035Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1084while and may block, so not sync_job-capable, ever. 1407while and may block, so not sync_job-capable, ever.
1085 1408
1086=cut 1409=cut
1087 1410
1088sub list_logins { 1411sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1412 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1413 or return [];
1091 1414
1092 my @logins; 1415 my @logins;
1093 1416
1094 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1129 } 1452 }
1130 1453
1131 \@paths 1454 \@paths
1132} 1455}
1133 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
1134=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1135 1508
1136Sends an ext reply to the player. 1509Sends an ext reply to the player.
1137 1510
1138=cut 1511=cut
1139 1512
1140sub ext_reply($$%) { 1513sub ext_reply($$@) {
1141 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1142 1515
1143 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1144
1145 $self->send ("ext " . cf::to_json \%msg);
1146} 1517}
1147 1518
1148=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1149 1520
1150Sends an ext event to the client. 1521Sends an ext event to the client.
1151 1522
1152=cut 1523=cut
1153 1524
1154sub ext_event($$%) { 1525sub ext_msg($$@) {
1155 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1156 1527
1157 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1158} 1529}
1159 1530
1160=head3 cf::region 1531=head3 cf::region
1161 1532
1162=over 4 1533=over 4
1165 1536
1166package cf::region; 1537package cf::region;
1167 1538
1168=item cf::region::find_by_path $path 1539=item cf::region::find_by_path $path
1169 1540
1170Tries to decuce the probable region for a map knowing only its path. 1541Tries to decuce the likely region for a map knowing only its path.
1171 1542
1172=cut 1543=cut
1173 1544
1174sub find_by_path($) { 1545sub find_by_path($) {
1175 my ($path) = @_; 1546 my ($path) = @_;
1176 1547
1177 my ($match, $specificity); 1548 my ($match, $specificity);
1178 1549
1179 for my $region (list) { 1550 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1181 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1183 } 1554 }
1184 } 1555 }
1185 1556
1249 my ($self, $merge) = @_; 1620 my ($self, $merge) = @_;
1250 1621
1251 # we have to keep some variables in memory intact 1622 # we have to keep some variables in memory intact
1252 local $self->{path}; 1623 local $self->{path};
1253 local $self->{load_path}; 1624 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256 1625
1257 $self->SUPER::thawer_merge ($merge); 1626 $self->SUPER::thawer_merge ($merge);
1258} 1627}
1259 1628
1260sub normalise { 1629sub normalise {
1307 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1308 return $self; 1677 return $self;
1309 } 1678 }
1310 } 1679 }
1311 1680
1312 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1313 () 1682 ()
1314} 1683}
1315 1684
1316sub init { 1685sub init {
1317 my ($self) = @_; 1686 my ($self) = @_;
1332 1701
1333# the original (read-only) location 1702# the original (read-only) location
1334sub load_path { 1703sub load_path {
1335 my ($self) = @_; 1704 my ($self) = @_;
1336 1705
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1706 "$MAPDIR/$self->{path}.map"
1338} 1707}
1339 1708
1340# the temporary/swap location 1709# the temporary/swap location
1341sub save_path { 1710sub save_path {
1342 my ($self) = @_; 1711 my ($self) = @_;
1343 1712
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1714 "$TMPDIR/$path.map"
1346} 1715}
1347 1716
1348# the unique path, undef == no special unique path 1717# the unique path, undef == no special unique path
1349sub uniq_path { 1718sub uniq_path {
1350 my ($self) = @_; 1719 my ($self) = @_;
1351 1720
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1722 "$UNIQUEDIR/$path"
1354} 1723}
1355 1724
1356# and all this just because we cannot iterate over 1725# and all this just because we cannot iterate over
1357# all maps in C++... 1726# all maps in C++...
1358sub change_all_map_light { 1727sub change_all_map_light {
1359 my ($change) = @_; 1728 my ($change) = @_;
1360 1729
1361 $_->change_map_light ($change) 1730 $_->change_map_light ($change)
1362 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;
1363} 1740}
1364 1741
1365sub unlink_save { 1742sub unlink_save {
1366 my ($self) = @_; 1743 my ($self) = @_;
1367 1744
1425 $self->load_header_orig 1802 $self->load_header_orig
1426 or return; 1803 or return;
1427 $self->prepare_orig; 1804 $self->prepare_orig;
1428 } 1805 }
1429 1806
1807 $self->{deny_reset} = 1
1808 if $self->no_reset;
1809
1430 $self->default_region (cf::region::find_by_path $self->{path}) 1810 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region; 1811 unless $self->default_region;
1432 1812
1433 1 1813 1
1434} 1814}
1449 $map->{last_save} = $cf::RUNTIME; 1829 $map->{last_save} = $cf::RUNTIME;
1450 1830
1451 $map->load_header 1831 $map->load_header
1452 or return; 1832 or return;
1453 1833
1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously 1835 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait; 1836 #$cf::WAIT_FOR_TICK->wait;
1457 $map->reset; 1837 $map->reset;
1458 undef $guard; 1838 undef $guard;
1459 return find $path; 1839 return find $path;
1470 my ($self) = @_; 1850 my ($self) = @_;
1471 1851
1472 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1473 1853
1474 my $path = $self->{path}; 1854 my $path = $self->{path};
1855
1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1475 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1476 1859
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1861
1479 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1480 1863
1481 $self->alloc; 1864 $self->alloc;
1482 1865
1483 $self->pre_load; 1866 $self->pre_load;
1484 Coro::cede; 1867 cf::cede_to_tick;
1485 1868
1486 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1487 or return; 1870 or return;
1488 1871
1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1490 if delete $self->{load_original}; 1873 if delete $self->{load_original};
1491 1874
1492 if (my $uniq = $self->uniq_path) { 1875 if (my $uniq = $self->uniq_path) {
1493 utf8::encode $uniq; 1876 utf8::encode $uniq;
1494 if (aio_open $uniq, O_RDONLY, 0) { 1877 if (aio_open $uniq, O_RDONLY, 0) {
1495 $self->clear_unique_items; 1878 $self->clear_unique_items;
1496 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1497 } 1880 }
1498 } 1881 }
1499 1882
1500 Coro::cede; 1883 cf::cede_to_tick;
1501 # now do the right thing for maps 1884 # now do the right thing for maps
1502 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1503 Coro::cede;
1504
1505 unless ($self->{deny_activate}) {
1506 $self->decay_objects;
1507 $self->fix_auto_apply;
1508 $self->update_buttons;
1509 Coro::cede;
1510 $self->set_darkness_map;
1511 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1887 unless $self->difficulty;
1513 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;
1514 $self->activate; 1897 $self->activate;
1515 Coro::cede; 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1902
1903 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1904 }
1517 1905
1518 $self->post_load; 1906 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1907}
1523 1908
1524sub customise_for { 1909sub customise_for {
1525 my ($self, $ob) = @_; 1910 my ($self, $ob) = @_;
1526 1911
1527 return find "~" . $ob->name . "/" . $self->{path} 1912 return find "~" . $ob->name . "/" . $self->{path}
1528 if $self->per_player; 1913 if $self->per_player;
1529 1914
1915# return find "?party/" . $ob->name . "/" . $self->{path}
1916# if $self->per_party;
1917
1530 $self 1918 $self
1531} 1919}
1532 1920
1533# 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
1534sub load_diag { 1922sub load_neighbours {
1535 my ($map) = @_; 1923 my ($map) = @_;
1536 1924
1537 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1538 1926
1539 for (0 .. 3) { 1927 for (0 .. 3) {
1540 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1541 or next; 1929 or next;
1542 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1543 or next; 1931 or next;
1544 $neigh->load; 1932 $neigh->load;
1545 1933
1934 push @neigh,
1546 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1547 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1548 } 1937 }
1549 1938
1550 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1551 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1552 or next; 1942 or next;
1553 $neigh->load; 1943 $neigh->load;
1554 } 1944 }
1555} 1945}
1556 1946
1561} 1951}
1562 1952
1563sub do_load_sync { 1953sub do_load_sync {
1564 my ($map) = @_; 1954 my ($map) = @_;
1565 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1566 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1567} 1960}
1568 1961
1569our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1570our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1571 1964
1572sub find_async { 1965sub find_async {
1573 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1574 1967
1575 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1576 1969
1577 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1578 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1579 } 1972 }
1580 1973
1581 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1582 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1583 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1584 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1585 my $map = find $path 1979 if (my $map = find $k) {
1586 or next;
1587 $map->load; 1980 $map->load if $v;
1981 }
1588 1982
1589 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1590 } 1984 }
1591 } 1985 }
1592 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1593 }; 1987 };
1594 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
1597} 1991}
1598 1992
1599sub save { 1993sub save {
1600 my ($self) = @_; 1994 my ($self) = @_;
1601 1995
1602 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1603 1997
1604 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1605 1999
1606 return unless $self->dirty; 2000 return unless $self->dirty;
1607 2001
1630 my ($self) = @_; 2024 my ($self) = @_;
1631 2025
1632 # save first because save cedes 2026 # save first because save cedes
1633 $self->save; 2027 $self->save;
1634 2028
1635 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1636 2030
1637 return if $self->players; 2031 return if $self->players;
1638 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1639 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1640 2034
1644 2038
1645sub reset_at { 2039sub reset_at {
1646 my ($self) = @_; 2040 my ($self) = @_;
1647 2041
1648 # TODO: safety, remove and allow resettable per-player maps 2042 # TODO: safety, remove and allow resettable per-player maps
1649 return 1e99 if $self->isa ("ext::map_per_player");#d#
1650 return 1e99 if $self->{deny_reset}; 2043 return 1e99 if $self->{deny_reset};
1651 2044
1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2045 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1653 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;
1654 2047
1665 my ($self) = @_; 2058 my ($self) = @_;
1666 2059
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 2061
1669 return if $self->players; 2062 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d#
1671 2063
1672 warn "resetting map ", $self->path;#d# 2064 warn "resetting map ", $self->path;
1673 2065
1674 $self->in_memory (cf::MAP_SWAPPED); 2066 $self->in_memory (cf::MAP_SWAPPED);
1675 2067
1676 # need to save uniques path 2068 # need to save uniques path
1677 unless ($self->{deny_save}) { 2069 unless ($self->{deny_save}) {
1709 $cf::MAP{$self->path} = $self; 2101 $cf::MAP{$self->path} = $self;
1710 2102
1711 $self->reset; # polite request, might not happen 2103 $self->reset; # polite request, might not happen
1712} 2104}
1713 2105
2106=item $maps = cf::map::tmp_maps
2107
2108Returns an arrayref with all map paths of currently instantiated and saved
2109maps. May block.
2110
2111=cut
2112
2113sub tmp_maps() {
2114 [
2115 map {
2116 utf8::decode $_;
2117 /\.map$/
2118 ? normalise $_
2119 : ()
2120 } @{ aio_readdir $TMPDIR or [] }
2121 ]
2122}
2123
2124=item $maps = cf::map::random_maps
2125
2126Returns an arrayref with all map paths of currently instantiated and saved
2127random maps. May block.
2128
2129=cut
2130
2131sub random_maps() {
2132 [
2133 map {
2134 utf8::decode $_;
2135 /\.map$/
2136 ? normalise "?random/$_"
2137 : ()
2138 } @{ aio_readdir $RANDOMDIR or [] }
2139 ]
2140}
2141
1714=item cf::map::unique_maps 2142=item cf::map::unique_maps
1715 2143
1716Returns an arrayref of paths of all shared maps that have 2144Returns an arrayref of paths of all shared maps that have
1717instantiated unique items. May block. 2145instantiated unique items. May block.
1718 2146
1719=cut 2147=cut
1720 2148
1721sub unique_maps() { 2149sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2150 [
1723 or return; 2151 map {
1724
1725 my @paths;
1726
1727 for (@$files) {
1728 utf8::decode $_; 2152 utf8::decode $_;
1729 next if /\.pst$/; 2153 /\.map$/
1730 next unless /^$PATH_SEP/o; 2154 ? normalise $_
1731 2155 : ()
1732 push @paths, cf::map::normalise $_; 2156 } @{ aio_readdir $UNIQUEDIR or [] }
1733 } 2157 ]
1734
1735 \@paths
1736} 2158}
1737 2159
1738package cf; 2160package cf;
1739 2161
1740=back 2162=back
1786 2208
1787 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2209 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1788 2210
1789 if ($self->{record_replies}) { 2211 if ($self->{record_replies}) {
1790 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2212 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2213
1791 } else { 2214 } else {
2215 my $pl = $self->contr;
2216
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $dialog = $pl->{npc_dialog};
2219 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220
2221 } else {
1792 $msg = $npc->name . " says: $msg" if $npc; 2222 $msg = $npc->name . " says: $msg" if $npc;
1793 $self->message ($msg, $flags); 2223 $self->message ($msg, $flags);
2224 }
1794 } 2225 }
2226}
2227
2228=item $object->send_msg ($channel, $msg, $color, [extra...])
2229
2230=cut
2231
2232sub cf::object::send_msg {
2233 my $pl = shift->contr
2234 or return;
2235 $pl->send_msg (@_);
1795} 2236}
1796 2237
1797=item $player_object->may ("access") 2238=item $player_object->may ("access")
1798 2239
1799Returns wether the given player is authorized to access resource "access" 2240Returns wether the given player is authorized to access resource "access"
1846 $self->deactivate_recursive; 2287 $self->deactivate_recursive;
1847 2288
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2289 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 2290
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2291 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 2292 if $self->map && $self->map->{path} ne "{link}";
1852 2293
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2294 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 2295}
1855 2296
1856sub cf::object::player::leave_link { 2297sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 2298 my ($self, $map, $x, $y) = @_;
2299
2300 return unless $self->contr->active;
1858 2301
1859 my $link_pos = delete $self->{_link_pos}; 2302 my $link_pos = delete $self->{_link_pos};
1860 2303
1861 unless ($map) { 2304 unless ($map) {
1862 # restore original map position 2305 # restore original map position
1876 # use -1 or undef as default coordinates, not 0, 0 2319 # use -1 or undef as default coordinates, not 0, 0
1877 ($x, $y) = ($map->enter_x, $map->enter_y) 2320 ($x, $y) = ($map->enter_x, $map->enter_y)
1878 if $x <=0 && $y <= 0; 2321 if $x <=0 && $y <= 0;
1879 2322
1880 $map->load; 2323 $map->load;
1881 $map->load_diag; 2324 $map->load_neighbours;
1882 2325
1883 return unless $self->contr->active; 2326 return unless $self->contr->active;
1884 $self->activate_recursive; 2327 $self->activate_recursive;
1885 2328
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 2330 $self->enter_map ($map, $x, $y);
1888} 2331}
1889 2332
1890cf::player->attach ( 2333=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1891 on_logout => sub {
1892 my ($pl) = @_;
1893 2334
1894 # abort map switching before logout 2335Moves the player to the given map-path and coordinates by first freezing
1895 if ($pl->ob->{_link_pos}) { 2336her, loading and preparing them map, calling the provided $check callback
1896 cf::sync_job { 2337that has to return the map if sucecssful, and then unfreezes the player on
1897 $pl->ob->leave_link 2338the new (success) or old (failed) map position. In either case, $done will
1898 }; 2339be called at the end of this process.
1899 }
1900 },
1901 on_login => sub {
1902 my ($pl) = @_;
1903 2340
1904 # try to abort aborted map switching on player login :)
1905 # should happen only on crashes
1906 if ($pl->ob->{_link_pos}) {
1907 $pl->ob->enter_link;
1908 (async {
1909 $pl->ob->reply (undef,
1910 "There was an internal problem at your last logout, "
1911 . "the server will try to bring you to your intended destination in a second.",
1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1915 Coro::Timer::sleep 1;
1916 $pl->ob->leave_link;
1917 })->prio (2);
1918 }
1919 },
1920);
1921
1922=item $player_object->goto ($path, $x, $y)
1923
1924=cut 2341=cut
2342
2343our $GOTOGEN;
1925 2344
1926sub cf::object::player::goto { 2345sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 2346 my ($self, $path, $x, $y, $check, $done) = @_;
2347
2348 # do generation counting so two concurrent goto's will be executed in-order
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 2350
1929 $self->enter_link; 2351 $self->enter_link;
1930 2352
1931 (async { 2353 (async {
1932 my $map = eval { 2354 my $map = eval {
1933 my $map = cf::map::find $path; 2355 my $map = cf::map::find $path;
2356
2357 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 2358 $map = $map->customise_for ($self);
2359 $map = $check->($map) if $check && $map;
2360 } else {
2361 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2362 }
2363
1935 $map 2364 $map
2365 };
2366
2367 if ($@) {
2368 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2369 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 2370 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 2371
2372 if ($gen == $self->{_goto_generation}) {
2373 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 2374 $self->leave_link ($map, $x, $y);
2375 }
2376
2377 $done->() if $done;
1940 })->prio (1); 2378 })->prio (1);
1941} 2379}
1942 2380
1943=item $player_object->enter_exit ($exit_object) 2381=item $player_object->enter_exit ($exit_object)
1944 2382
1983 2421
1984 $rmp->{random_seed} ||= $exit->random_seed; 2422 $rmp->{random_seed} ||= $exit->random_seed;
1985 2423
1986 my $data = cf::to_json $rmp; 2424 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2425 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2426 my $meta = "$RANDOMDIR/$md5.meta";
1989 2427
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2428 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2429 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2430 undef $fh;
1993 aio_rename "$meta~", $meta; 2431 aio_rename "$meta~", $meta;
2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2450 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2013 my $hp = $exit->stats->hp; 2451 my $hp = $exit->stats->hp;
2014 my $sp = $exit->stats->sp; 2452 my $sp = $exit->stats->sp;
2015 2453
2016 $self->enter_link; 2454 $self->enter_link;
2455
2456 # if exit is damned, update players death & WoR home-position
2457 $self->contr->savebed ($slaying, $hp, $sp)
2458 if $exit->flag (FLAG_DAMNED);
2017 2459
2018 (async { 2460 (async {
2019 $self->deactivate_recursive; # just to be sure 2461 $self->deactivate_recursive; # just to be sure
2020 unless (eval { 2462 unless (eval {
2021 $self->goto ($slaying, $hp, $sp); 2463 $self->goto ($slaying, $hp, $sp);
2049 2491
2050 utf8::encode $text; 2492 utf8::encode $text;
2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2493 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2052} 2494}
2053 2495
2496=item $client->send_msg ($channel, $msg, $color, [extra...])
2497
2498Send a drawinfo or msg packet to the client, formatting the msg for the
2499client if neccessary. C<$type> should be a string identifying the type of
2500the message, with C<log> being the default. If C<$color> is negative, suppress
2501the message unless the client supports the msg packet.
2502
2503=cut
2504
2505sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_;
2507
2508 $msg = $self->pl->expand_cfpod ($msg);
2509
2510 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511
2512 if (ref $channel) {
2513 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel);
2517 }
2518
2519 $channel = $channel->{id};
2520 }
2521
2522 return unless @extra || length $msg;
2523
2524 if ($self->can_msg) {
2525 # default colour, mask it out
2526 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 if $color & cf::NDI_DEF;
2528
2529 $self->send_packet ("msg " . $self->{json_coder}->encode (
2530 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2531 } else {
2532 if ($color >= 0) {
2533 # replace some tags by gcfclient-compatible ones
2534 for ($msg) {
2535 1 while
2536 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2537 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2538 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2539 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2541 }
2542
2543 $color &= cf::NDI_COLOR_MASK;
2544
2545 utf8::encode $msg;
2546
2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2550 } else {
2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2552 $self->send_packet ("drawinfo $color $msg")
2553 }
2554 }
2555 }
2556}
2557
2054=item $client->ext_event ($type, %msg) 2558=item $client->ext_msg ($type, @msg)
2055 2559
2056Sends an exti event to the client. 2560Sends an ext event to the client.
2057 2561
2058=cut 2562=cut
2059 2563
2060sub cf::client::ext_event($$%) { 2564sub cf::client::ext_msg($$@) {
2061 my ($self, $type, %msg) = @_; 2565 my ($self, $type, @msg) = @_;
2062 2566
2567 if ($self->extcmd == 2) {
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2569 } elsif ($self->extcmd == 1) { # TODO: remove
2063 $msg{msgtype} = "event_$type"; 2570 push @msg, msgtype => "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg); 2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2572 }
2573}
2574
2575=item $client->ext_reply ($msgid, @msg)
2576
2577Sends an ext reply to the client.
2578
2579=cut
2580
2581sub cf::client::ext_reply($$@) {
2582 my ($self, $id, @msg) = @_;
2583
2584 if ($self->extcmd == 2) {
2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2586 } elsif ($self->extcmd == 1) {
2587 #TODO: version 1, remove
2588 unshift @msg, msgtype => "reply", msgid => $id;
2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2590 }
2065} 2591}
2066 2592
2067=item $success = $client->query ($flags, "text", \&cb) 2593=item $success = $client->query ($flags, "text", \&cb)
2068 2594
2069Queues a query to the client, calling the given callback with 2595Queues a query to the client, calling the given callback with
2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2596the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2071C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2597C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2072 2598
2073Queries can fail, so check the return code. Or don't, as queries will become 2599Queries can fail, so check the return code. Or don't, as queries will
2074reliable at some point in the future. 2600become reliable at some point in the future.
2075 2601
2076=cut 2602=cut
2077 2603
2078sub cf::client::query { 2604sub cf::client::query {
2079 my ($self, $flags, $text, $cb) = @_; 2605 my ($self, $flags, $text, $cb) = @_;
2087 utf8::encode $text; 2613 utf8::encode $text;
2088 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2614 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2089 2615
2090 $self->send_packet ($self->{query_queue}[0][0]) 2616 $self->send_packet ($self->{query_queue}[0][0])
2091 if @{ $self->{query_queue} } == 1; 2617 if @{ $self->{query_queue} } == 1;
2618
2619 1
2092} 2620}
2093 2621
2094cf::client->attach ( 2622cf::client->attach (
2623 on_connect => sub {
2624 my ($ns) = @_;
2625
2626 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2627 },
2095 on_reply => sub { 2628 on_reply => sub {
2096 my ($ns, $msg) = @_; 2629 my ($ns, $msg) = @_;
2097 2630
2098 # this weird shuffling is so that direct followup queries 2631 # this weird shuffling is so that direct followup queries
2099 # get handled first 2632 # get handled first
2111 } else { 2644 } else {
2112 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2645 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2113 } 2646 }
2114 } 2647 }
2115 }, 2648 },
2649 on_exticmd => sub {
2650 my ($ns, $buf) = @_;
2651
2652 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2653
2654 if (ref $msg) {
2655 my ($type, $reply, @payload) =
2656 "ARRAY" eq ref $msg
2657 ? @$msg
2658 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2659
2660 my @reply;
2661
2662 if (my $cb = $EXTICMD{$type}) {
2663 @reply = $cb->($ns, @payload);
2664 }
2665
2666 $ns->ext_reply ($reply, @reply)
2667 if $reply;
2668
2669 } else {
2670 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2671 }
2672
2673 cf::override;
2674 },
2116); 2675);
2117 2676
2118=item $client->async (\&cb) 2677=item $client->async (\&cb)
2119 2678
2120Create a new coroutine, running the specified callback. The coroutine will 2679Create a new coroutine, running the specified callback. The coroutine will
2161our $safe = new Safe "safe"; 2720our $safe = new Safe "safe";
2162our $safe_hole = new Safe::Hole; 2721our $safe_hole = new Safe::Hole;
2163 2722
2164$SIG{FPE} = 'IGNORE'; 2723$SIG{FPE} = 'IGNORE';
2165 2724
2166$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2725$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math
2727 grepstart grepwhile mapstart mapwhile
2728 sort time
2729));
2167 2730
2168# here we export the classes and methods available to script code 2731# here we export the classes and methods available to script code
2169 2732
2170=pod 2733=pod
2171 2734
2172The following functions and methods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2173 2736
2174 cf::object contr pay_amount pay_player map 2737 cf::object
2738 contr pay_amount pay_player map x y force_find force_add
2739 insert remove name archname title slaying race decrease_ob_nr
2740
2175 cf::object::player player 2741 cf::object::player
2176 cf::player peaceful 2742 player
2177 cf::map trigger 2743
2744 cf::player
2745 peaceful
2746
2747 cf::map
2748 trigger
2178 2749
2179=cut 2750=cut
2180 2751
2181for ( 2752for (
2182 ["cf::object" => qw(contr pay_amount pay_player map)], 2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race
2755 decrease_ob_nr)],
2183 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2184 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2185 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2186) { 2759) {
2187 no strict 'refs'; 2760 no strict 'refs';
2258=back 2831=back
2259 2832
2260=cut 2833=cut
2261 2834
2262############################################################################# 2835#############################################################################
2263
2264=head2 EXTENSION DATABASE SUPPORT
2265
2266Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which
2268excludes objects.
2269
2270The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique.
2272
2273=over 4
2274
2275=item $value = cf::db_get $family => $key
2276
2277Returns a single value from the database.
2278
2279=item cf::db_put $family => $key => $value
2280
2281Stores the given C<$value> in the family.
2282
2283=cut
2284
2285our $DB;
2286
2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2306
2307 cf::db_put (board => data => $pst->{board});
2308 cf::db_put (guildrules => data => $pst->{guildrules});
2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312 unlink $path;
2313 };
2314 }
2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2332}
2333
2334#############################################################################
2335# the server's init and main functions 2836# the server's init and main functions
2336 2837
2337sub load_facedata { 2838sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 2839 my ($path) = @_;
2840
2841 # HACK to clear player env face cache, we need some signal framework
2842 # for this (global event?)
2843 %ext::player_env::MUSIC_FACE_CACHE = ();
2844
2845 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2339 2846
2340 warn "loading facedata from $path\n"; 2847 warn "loading facedata from $path\n";
2341 2848
2342 my $facedata; 2849 my $facedata;
2343 0 < aio_load $path, $facedata 2850 0 < aio_load $path, $facedata
2346 $facedata = Coro::Storable::thaw $facedata; 2853 $facedata = Coro::Storable::thaw $facedata;
2347 2854
2348 $facedata->{version} == 2 2855 $facedata->{version} == 2
2349 or cf::cleanup "$path: version mismatch, cannot proceed."; 2856 or cf::cleanup "$path: version mismatch, cannot proceed.";
2350 2857
2858 # patch in the exptable
2859 $facedata->{resource}{"res/exp_table"} = {
2860 type => FT_RSRC,
2861 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2862 };
2863 cf::cede_to_tick;
2864
2351 { 2865 {
2352 my $faces = $facedata->{faceinfo}; 2866 my $faces = $facedata->{faceinfo};
2353 2867
2354 while (my ($face, $info) = each %$faces) { 2868 while (my ($face, $info) = each %$faces) {
2355 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2869 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2356 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2870 cf::face::set_visibility $idx, $info->{visibility};
2871 cf::face::set_magicmap $idx, $info->{magicmap};
2357 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2872 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2358 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2873 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2359 Coro::cede; 2874
2875 cf::cede_to_tick;
2360 } 2876 }
2361 2877
2362 while (my ($face, $info) = each %$faces) { 2878 while (my ($face, $info) = each %$faces) {
2363 next unless $info->{smooth}; 2879 next unless $info->{smooth};
2364 my $idx = cf::face::find $face 2880 my $idx = cf::face::find $face
2365 or next; 2881 or next;
2366 if (my $smooth = cf::face::find $info->{smooth}) { 2882 if (my $smooth = cf::face::find $info->{smooth}) {
2883 cf::face::set_smooth $idx, $smooth;
2367 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2884 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2368 } else { 2885 } else {
2369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2886 warn "smooth face '$info->{smooth}' not found for face '$face'";
2370 } 2887 }
2371 Coro::cede; 2888
2889 cf::cede_to_tick;
2372 } 2890 }
2373 } 2891 }
2374 2892
2375 { 2893 {
2376 my $anims = $facedata->{animinfo}; 2894 my $anims = $facedata->{animinfo};
2377 2895
2378 while (my ($anim, $info) = each %$anims) { 2896 while (my ($anim, $info) = each %$anims) {
2379 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2897 cf::anim::set $anim, $info->{frames}, $info->{facings};
2380 Coro::cede; 2898 cf::cede_to_tick;
2381 } 2899 }
2382 2900
2383 cf::anim::invalidate_all; # d'oh 2901 cf::anim::invalidate_all; # d'oh
2384 } 2902 }
2385 2903
2904 {
2905 # TODO: for gcfclient pleasure, we should give resources
2906 # that gcfclient doesn't grok a >10000 face index.
2907 my $res = $facedata->{resource};
2908
2909 my $soundconf = delete $res->{"res/sound.conf"};
2910
2911 while (my ($name, $info) = each %$res) {
2912 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2913 my $data;
2914
2915 if ($info->{type} & 1) {
2916 # prepend meta info
2917
2918 my $meta = $enc->encode ({
2919 name => $name,
2920 %{ $info->{meta} || {} },
2921 });
2922
2923 $data = pack "(w/a*)*", $meta, $info->{data};
2924 } else {
2925 $data = $info->{data};
2926 }
2927
2928 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2929 cf::face::set_type $idx, $info->{type};
2930
2931 cf::cede_to_tick;
2932 }
2933
2934 if ($soundconf) {
2935 $soundconf = $enc->decode (delete $soundconf->{data});
2936
2937 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2938 my $sound = $soundconf->{compat}[$_]
2939 or next;
2940
2941 my $face = cf::face::find "sound/$sound->[1]";
2942 cf::sound::set $sound->[0] => $face;
2943 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2944 }
2945
2946 while (my ($k, $v) = each %{$soundconf->{event}}) {
2947 my $face = cf::face::find "sound/$v";
2948 cf::sound::set $k => $face;
2949 }
2950 }
2951 }
2952
2386 1 2953 1
2387} 2954}
2388 2955
2956register_exticmd fx_want => sub {
2957 my ($ns, $want) = @_;
2958
2959 while (my ($k, $v) = each %$want) {
2960 $ns->fx_want ($k, $v);
2961 }
2962};
2963
2964sub reload_regions {
2965 # HACK to clear player env face cache, we need some signal framework
2966 # for this (global event?)
2967 %ext::player_env::MUSIC_FACE_CACHE = ();
2968
2969 load_resource_file "$MAPDIR/regions"
2970 or die "unable to load regions file\n";
2971
2972 for (cf::region::list) {
2973 $_->{match} = qr/$_->{match}/
2974 if exists $_->{match};
2975 }
2976}
2977
2978sub reload_facedata {
2979 load_facedata "$DATADIR/facedata"
2980 or die "unable to load facedata\n";
2981}
2982
2983sub reload_archetypes {
2984 load_resource_file "$DATADIR/archetypes"
2985 or die "unable to load archetypes\n";
2986 #d# NEED to laod twice to resolve forward references
2987 # this really needs to be done in an extra post-pass
2988 # (which needs to be synchronous, so solve it differently)
2989 load_resource_file "$DATADIR/archetypes"
2990 or die "unable to load archetypes\n";
2991}
2992
2993sub reload_treasures {
2994 load_resource_file "$DATADIR/treasures"
2995 or die "unable to load treasurelists\n";
2996}
2997
2389sub reload_resources { 2998sub reload_resources {
2390 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2999 warn "reloading resource files...\n";
2391 or die "unable to load regions file\n";#d# 3000
3001 reload_regions;
2392 load_facedata 3002 reload_facedata;
2393 or die "unable to load facedata\n";#d# 3003 #reload_archetypes;#d#
3004 reload_archetypes;
3005 reload_treasures;
3006
3007 warn "finished reloading resource files\n";
2394} 3008}
2395 3009
2396sub init { 3010sub init {
2397 reload_resources; 3011 reload_resources;
2398} 3012}
2399 3013
2400sub cfg_load { 3014sub reload_config {
2401 open my $fh, "<:utf8", cf::confdir . "/config" 3015 open my $fh, "<:utf8", "$CONFDIR/config"
2402 or return; 3016 or return;
2403 3017
2404 local $/; 3018 local $/;
2405 *CFG = YAML::Syck::Load <$fh>; 3019 *CFG = YAML::Syck::Load <$fh>;
2406 3020
2425 (async { 3039 (async {
2426 Event::one_event; 3040 Event::one_event;
2427 })->prio (Coro::PRIO_MAX); 3041 })->prio (Coro::PRIO_MAX);
2428 }; 3042 };
2429 3043
2430 cfg_load; 3044 reload_config;
2431 db_init; 3045 db_init;
2432 load_extensions; 3046 load_extensions;
2433 3047
2434 $TICK_WATCHER->start; 3048 $TICK_WATCHER->start;
2435 Event::loop; 3049 Event::loop;
2451 }, 3065 },
2452 ); 3066 );
2453 } 3067 }
2454} 3068}
2455 3069
3070sub write_runtime {
3071 my $runtime = "$LOCALDIR/runtime";
3072
3073 # first touch the runtime file to show we are still running:
3074 # the fsync below can take a very very long time.
3075
3076 IO::AIO::aio_utime $runtime, undef, undef;
3077
3078 my $guard = cf::lock_acquire "write_runtime";
3079
3080 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3081 or return;
3082
3083 my $value = $cf::RUNTIME + 90 + 10;
3084 # 10 is the runtime save interval, for a monotonic clock
3085 # 60 allows for the watchdog to kill the server.
3086
3087 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3088 and return;
3089
3090 # always fsync - this file is important
3091 aio_fsync $fh
3092 and return;
3093
3094 # touch it again to show we are up-to-date
3095 aio_utime $fh, undef, undef;
3096
3097 close $fh
3098 or return;
3099
3100 aio_rename "$runtime~", $runtime
3101 and return;
3102
3103 warn "runtime file written.\n";
3104
3105 1
3106}
3107
2456sub emergency_save() { 3108sub emergency_save() {
2457 my $freeze_guard = cf::freeze_mainloop; 3109 my $freeze_guard = cf::freeze_mainloop;
2458 3110
2459 warn "enter emergency perl save\n"; 3111 warn "enter emergency perl save\n";
2460 3112
2491 3143
2492 warn Carp::longmess "post_cleanup backtrace" 3144 warn Carp::longmess "post_cleanup backtrace"
2493 if $make_core; 3145 if $make_core;
2494} 3146}
2495 3147
2496sub reload() { 3148sub do_reload_perl() {
2497 # can/must only be called in main 3149 # can/must only be called in main
2498 if ($Coro::current != $Coro::main) { 3150 if ($Coro::current != $Coro::main) {
2499 warn "can only reload from main coroutine"; 3151 warn "can only reload from main coroutine";
2500 return; 3152 return;
2501 } 3153 }
2535 %EXT_CORO = (); 3187 %EXT_CORO = ();
2536 3188
2537 warn "removing commands"; 3189 warn "removing commands";
2538 %COMMAND = (); 3190 %COMMAND = ();
2539 3191
2540 warn "removing ext commands"; 3192 warn "removing ext/exti commands";
2541 %EXTCMD = (); 3193 %EXTCMD = ();
3194 %EXTICMD = ();
2542 3195
2543 warn "unloading/nuking all extensions"; 3196 warn "unloading/nuking all extensions";
2544 for my $pkg (@EXTS) { 3197 for my $pkg (@EXTS) {
2545 warn "... unloading $pkg"; 3198 warn "... unloading $pkg";
2546 3199
2576 Symbol::delete_package "safe::$_" 3229 Symbol::delete_package "safe::$_"
2577 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3230 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2578 3231
2579 warn "unloading cf.pm \"a bit\""; 3232 warn "unloading cf.pm \"a bit\"";
2580 delete $INC{"cf.pm"}; 3233 delete $INC{"cf.pm"};
3234 delete $INC{"cf/pod.pm"};
2581 3235
2582 # don't, removes xs symbols, too, 3236 # don't, removes xs symbols, too,
2583 # and global variables created in xs 3237 # and global variables created in xs
2584 #Symbol::delete_package __PACKAGE__; 3238 #Symbol::delete_package __PACKAGE__;
2585 3239
2588 warn "reloading cf.pm"; 3242 warn "reloading cf.pm";
2589 require cf; 3243 require cf;
2590 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3244 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2591 3245
2592 warn "loading config and database again"; 3246 warn "loading config and database again";
2593 cf::cfg_load; 3247 cf::reload_config;
2594 3248
2595 warn "loading extensions"; 3249 warn "loading extensions";
2596 cf::load_extensions; 3250 cf::load_extensions;
2597 3251
2598 warn "reattaching attachments to objects/players"; 3252 warn "reattaching attachments to objects/players";
2600 warn "reattaching attachments to maps"; 3254 warn "reattaching attachments to maps";
2601 reattach $_ for values %MAP; 3255 reattach $_ for values %MAP;
2602 warn "reattaching attachments to players"; 3256 warn "reattaching attachments to players";
2603 reattach $_ for values %PLAYER; 3257 reattach $_ for values %PLAYER;
2604 3258
2605 warn "loading reloadable resources";
2606 reload_resources;
2607
2608 warn "leaving sync_job"; 3259 warn "leaving sync_job";
2609 3260
2610 1 3261 1
2611 } or do { 3262 } or do {
2612 warn $@; 3263 warn $@;
2617 warn "reloaded"; 3268 warn "reloaded";
2618}; 3269};
2619 3270
2620our $RELOAD_WATCHER; # used only during reload 3271our $RELOAD_WATCHER; # used only during reload
2621 3272
3273sub reload_perl() {
3274 # doing reload synchronously and two reloads happen back-to-back,
3275 # coro crashes during coro_state_free->destroy here.
3276
3277 $RELOAD_WATCHER ||= Event->timer (
3278 reentrant => 0,
3279 after => 0,
3280 data => WF_AUTOCANCEL,
3281 cb => sub {
3282 do_reload_perl;
3283 undef $RELOAD_WATCHER;
3284 },
3285 );
3286}
3287
2622register_command "reload" => sub { 3288register_command "reload" => sub {
2623 my ($who, $arg) = @_; 3289 my ($who, $arg) = @_;
2624 3290
2625 if ($who->flag (FLAG_WIZ)) { 3291 if ($who->flag (FLAG_WIZ)) {
2626 $who->message ("reloading server."); 3292 $who->message ("reloading server.");
2627 3293 async { reload_perl };
2628 # doing reload synchronously and two reloads happen back-to-back,
2629 # coro crashes during coro_state_free->destroy here.
2630
2631 $RELOAD_WATCHER ||= Event->timer (
2632 reentrant => 0,
2633 after => 0,
2634 data => WF_AUTOCANCEL,
2635 cb => sub {
2636 reload;
2637 undef $RELOAD_WATCHER;
2638 },
2639 );
2640 } 3294 }
2641}; 3295};
2642 3296
2643unshift @INC, $LIBDIR; 3297unshift @INC, $LIBDIR;
2644 3298
2646 3300
2647our @WAIT_FOR_TICK; 3301our @WAIT_FOR_TICK;
2648our @WAIT_FOR_TICK_BEGIN; 3302our @WAIT_FOR_TICK_BEGIN;
2649 3303
2650sub wait_for_tick { 3304sub wait_for_tick {
3305 return unless $TICK_WATCHER->is_active;
3306 return if $Coro::current == $Coro::main;
3307
2651 my $signal = new Coro::Signal; 3308 my $signal = new Coro::Signal;
2652 push @WAIT_FOR_TICK, $signal; 3309 push @WAIT_FOR_TICK, $signal;
2653 $signal->wait; 3310 $signal->wait;
2654} 3311}
2655 3312
2656sub wait_for_tick_begin { 3313sub wait_for_tick_begin {
3314 return unless $TICK_WATCHER->is_active;
3315 return if $Coro::current == $Coro::main;
3316
2657 my $signal = new Coro::Signal; 3317 my $signal = new Coro::Signal;
2658 push @WAIT_FOR_TICK_BEGIN, $signal; 3318 push @WAIT_FOR_TICK_BEGIN, $signal;
2659 $signal->wait; 3319 $signal->wait;
2660} 3320}
2661 3321
3322 my $min = 1e6;#d#
3323 my $avg = 10;
2662$TICK_WATCHER = Event->timer ( 3324$TICK_WATCHER = Event->timer (
2663 reentrant => 0, 3325 reentrant => 0,
2664 parked => 1, 3326 parked => 1,
2665 prio => 0, 3327 prio => 0,
2666 at => $NEXT_TICK || $TICK, 3328 at => $NEXT_TICK || $TICK,
2670 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3332 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2671 unless ++$bug_warning > 10; 3333 unless ++$bug_warning > 10;
2672 return; 3334 return;
2673 } 3335 }
2674 3336
2675 $NOW = Event::time; 3337 $NOW = $tick_start = Event::time;
2676 3338
2677 cf::server_tick; # one server iteration 3339 cf::server_tick; # one server iteration
3340
3341 0 && sync_job {#d#
3342 for(1..10) {
3343 my $t = Event::time;
3344 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3345 or die;
3346
3347 $map->width (50);
3348 $map->height (50);
3349 $map->alloc;
3350 $map->_load_objects ("/tmp/x.map", 1);
3351 my $t = Event::time - $t;
3352
3353 #next unless $t < 0.0013;#d#
3354 if ($t < $min) {
3355 $min = $t;
3356 }
3357 $avg = $avg * 0.99 + $t * 0.01;
3358 }
3359 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3360 exit 0;
3361 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3362 };
3363
2678 $RUNTIME += $TICK; 3364 $RUNTIME += $TICK;
2679 $NEXT_TICK += $TICK; 3365 $NEXT_TICK += $TICK;
2680 3366
2681 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3367 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2682 $NEXT_RUNTIME_WRITE = $NOW + 10; 3368 $NEXT_RUNTIME_WRITE = $NOW + 10;
2684 write_runtime 3370 write_runtime
2685 or warn "ERROR: unable to write runtime file: $!"; 3371 or warn "ERROR: unable to write runtime file: $!";
2686 }; 3372 };
2687 } 3373 }
2688 3374
3375# my $AFTER = Event::time;
3376# warn $AFTER - $NOW;#d#
3377
2689 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3378 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2690 $sig->send; 3379 $sig->send;
2691 } 3380 }
2692 while (my $sig = shift @WAIT_FOR_TICK) { 3381 while (my $sig = shift @WAIT_FOR_TICK) {
2693 $sig->send; 3382 $sig->send;
2694 } 3383 }
2695 3384
2696# my $AFTER = Event::time; 3385 $NOW = Event::time;
2697# warn $AFTER - $NOW;#d#
2698 3386
2699 # if we are delayed by four ticks or more, skip them all 3387 # if we are delayed by four ticks or more, skip them all
2700 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3388 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2701 3389
2702 $TICK_WATCHER->at ($NEXT_TICK); 3390 $TICK_WATCHER->at ($NEXT_TICK);
2703 $TICK_WATCHER->start; 3391 $TICK_WATCHER->start;
3392
3393 $LOAD = ($NOW - $tick_start) / $TICK;
3394 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3395
3396 _post_tick;
3397
3398
2704 }, 3399 },
2705); 3400);
2706 3401
2707{ 3402{
2708 BDB::max_poll_time $TICK * 0.1; 3403 BDB::max_poll_time $TICK * 0.1;
2736 3431
2737 cf::sync_job { 3432 cf::sync_job {
2738 eval { 3433 eval {
2739 BDB::db_env_open 3434 BDB::db_env_open
2740 $DB_ENV, 3435 $DB_ENV,
2741 $BDB_ENV_DIR, 3436 $BDBDIR,
2742 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3437 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2743 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3438 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2744 0666; 3439 0666;
2745 3440
2746 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3441 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2747 3442
2748 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3443 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2749 $DB_ENV->set_lk_detect; 3444 $DB_ENV->set_lk_detect;
2750 }; 3445 };
2751 3446
2767 prio => 6, 3462 prio => 6,
2768 cb => \&IO::AIO::poll_cb, 3463 cb => \&IO::AIO::poll_cb,
2769 ); 3464 );
2770} 3465}
2771 3466
3467my $_log_backtrace;
3468
3469sub _log_backtrace {
3470 my ($msg, @addr) = @_;
3471
3472 $msg =~ s/\n//;
3473
3474 # limit the # of concurrent backtraces
3475 if ($_log_backtrace < 2) {
3476 ++$_log_backtrace;
3477 async {
3478 my @bt = fork_call {
3479 @addr = map { sprintf "%x", $_ } @addr;
3480 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3481 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3482 or die "addr2line: $!";
3483
3484 my @funcs;
3485 my @res = <$fh>;
3486 chomp for @res;
3487 while (@res) {
3488 my ($func, $line) = splice @res, 0, 2, ();
3489 push @funcs, "[$func] $line";
3490 }
3491
3492 @funcs
3493 };
3494
3495 LOG llevInfo, "[ABT] $msg\n";
3496 LOG llevInfo, "[ABT] $_\n" for @bt;
3497 --$_log_backtrace;
3498 };
3499 } else {
3500 LOG llevInfo, "[ABT] $msg\n";
3501 LOG llevInfo, "[ABT] [suppressed]\n";
3502 }
3503}
3504
3505# load additional modules
3506use cf::pod;
3507
2772END { cf::emergency_save } 3508END { cf::emergency_save }
2773 3509
27741 35101
2775 3511

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines