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.251 by root, Wed Apr 18 14:45:13 2007 UTC vs.
Revision 1.349 by root, Fri Aug 31 04:10:43 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines