ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.238 by root, Sat Apr 14 07:23:00 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43:46 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.64 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
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
81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
83 95
84# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
85our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
86 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
87binmode STDOUT; 103binmode STDOUT;
88binmode STDERR; 104binmode STDERR;
89 105
90# read virtual server time, if available 106# read virtual server time, if available
91unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
92 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
93 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
94 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
95} 111}
96 112
97mkdir cf::localdir; 113mkdir $_
98mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
99mkdir cf::localdir . "/" . cf::tmpdir;
100mkdir cf::localdir . "/" . cf::uniquedir;
101mkdir $RANDOM_MAPS;
102mkdir $BDB_ENV_DIR;
103 115
104our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
105 117
106sub cf::map::normalise; 118sub cf::map::normalise;
107 119
118=item $cf::RUNTIME 130=item $cf::RUNTIME
119 131
120The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
121every server tick. 133every server tick.
122 134
123=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
124 138
125The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
126be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
127 143
128=item $cf::NOW 144=item $cf::NOW
129 145
130The time of the last (current) server tick. 146The time of the last (current) server tick.
131 147
132=item $cf::TICK 148=item $cf::TICK
133 149
134The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
135 161
136=item %cf::CFG 162=item %cf::CFG
137 163
138Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
139from wherever your confdir points to. 165from wherever your confdir points to.
140 166
141=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
142 168
143These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
144or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
145processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
146window of cpu time available, or simply to synchronise to the server tick. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
147 178
148=back 179=back
149 180
150=cut 181=cut
151 182
152BEGIN { 183BEGIN {
153 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
154 my $msg = join "", @_; 185 my $msg = join "", @_;
155 utf8::encode $msg;
156 186
157 $msg .= "\n" 187 $msg .= "\n"
158 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
159 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
160 LOG llevError, $msg; 193 LOG llevError, $msg;
161 }; 194 };
162} 195}
163 196
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
169@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
170 204
171# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
172# within the Safe compartment. 206# within the Safe compartment.
173for my $pkg (qw( 207for my $pkg (qw(
174 cf::global cf::attachable 208 cf::global cf::attachable
182} 216}
183 217
184$Event::DIED = sub { 218$Event::DIED = sub {
185 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
186}; 220};
221
222#############################################################################
187 223
188=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
189 225
190=over 4 226=over 4
191 227
210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
211 $d 247 $d
212 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
213} 249}
214 250
215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
216
217=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
218 252
219Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
220 254
221=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
222 256
223Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
224 265
225=item cf::lock_wait $string 266=item cf::lock_wait $string
226 267
227Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
228 269
231Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
232a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
233for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
234returned. 275returned.
235 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
236Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
237uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
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/(?<![BIUGHT])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1478 # replace G<male|female> tags
1479 || s{G<([^>|]*)\|([^>]*)>}{
1480 $self->gender ? $2 : $1
1481 }ge
1482 # replace H<hint text>
1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1490
1491 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g;
1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1500 $_
1501}
1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507
1138=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1139 1509
1140Sends an ext reply to the player. 1510Sends an ext reply to the player.
1141 1511
1142=cut 1512=cut
1143 1513
1144sub ext_reply($$%) { 1514sub ext_reply($$@) {
1145 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1146 1516
1147 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1148
1149 $self->send ("ext " . cf::to_json \%msg);
1150} 1518}
1151 1519
1152=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1153 1521
1154Sends an ext event to the client. 1522Sends an ext event to the client.
1155 1523
1156=cut 1524=cut
1157 1525
1158sub ext_event($$%) { 1526sub ext_msg($$@) {
1159 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1160 1528
1161 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1162} 1530}
1163 1531
1164=head3 cf::region 1532=head3 cf::region
1165 1533
1166=over 4 1534=over 4
1169 1537
1170package cf::region; 1538package cf::region;
1171 1539
1172=item cf::region::find_by_path $path 1540=item cf::region::find_by_path $path
1173 1541
1174Tries to decuce the probable region for a map knowing only its path. 1542Tries to decuce the likely region for a map knowing only its path.
1175 1543
1176=cut 1544=cut
1177 1545
1178sub find_by_path($) { 1546sub find_by_path($) {
1179 my ($path) = @_; 1547 my ($path) = @_;
1180 1548
1181 my ($match, $specificity); 1549 my ($match, $specificity);
1182 1550
1183 for my $region (list) { 1551 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) { 1552 if ($region->{match} && $path =~ $region->{match}) {
1185 ($match, $specificity) = ($region, $region->specificity) 1553 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity; 1554 if $region->specificity > $specificity;
1187 } 1555 }
1188 } 1556 }
1189 1557
1253 my ($self, $merge) = @_; 1621 my ($self, $merge) = @_;
1254 1622
1255 # we have to keep some variables in memory intact 1623 # we have to keep some variables in memory intact
1256 local $self->{path}; 1624 local $self->{path};
1257 local $self->{load_path}; 1625 local $self->{load_path};
1258 local $self->{deny_save};
1259 local $self->{deny_reset};
1260 1626
1261 $self->SUPER::thawer_merge ($merge); 1627 $self->SUPER::thawer_merge ($merge);
1262} 1628}
1263 1629
1264sub normalise { 1630sub normalise {
1311 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1312 return $self; 1678 return $self;
1313 } 1679 }
1314 } 1680 }
1315 1681
1316 Carp::carp "unable to resolve path '$path' (base '$base')."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1317 () 1683 ()
1318} 1684}
1319 1685
1320sub init { 1686sub init {
1321 my ($self) = @_; 1687 my ($self) = @_;
1336 1702
1337# the original (read-only) location 1703# the original (read-only) location
1338sub load_path { 1704sub load_path {
1339 my ($self) = @_; 1705 my ($self) = @_;
1340 1706
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1707 "$MAPDIR/$self->{path}.map"
1342} 1708}
1343 1709
1344# the temporary/swap location 1710# the temporary/swap location
1345sub save_path { 1711sub save_path {
1346 my ($self) = @_; 1712 my ($self) = @_;
1347 1713
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1715 "$TMPDIR/$path.map"
1350} 1716}
1351 1717
1352# the unique path, undef == no special unique path 1718# the unique path, undef == no special unique path
1353sub uniq_path { 1719sub uniq_path {
1354 my ($self) = @_; 1720 my ($self) = @_;
1355 1721
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1723 "$UNIQUEDIR/$path"
1358} 1724}
1359 1725
1360# and all this just because we cannot iterate over 1726# and all this just because we cannot iterate over
1361# all maps in C++... 1727# all maps in C++...
1362sub change_all_map_light { 1728sub change_all_map_light {
1363 my ($change) = @_; 1729 my ($change) = @_;
1364 1730
1365 $_->change_map_light ($change) 1731 $_->change_map_light ($change)
1366 for grep $_->outdoor, values %cf::MAP; 1732 for grep $_->outdoor, values %cf::MAP;
1733}
1734
1735sub decay_objects {
1736 my ($self) = @_;
1737
1738 return if $self->{deny_reset};
1739
1740 $self->do_decay_objects;
1367} 1741}
1368 1742
1369sub unlink_save { 1743sub unlink_save {
1370 my ($self) = @_; 1744 my ($self) = @_;
1371 1745
1429 $self->load_header_orig 1803 $self->load_header_orig
1430 or return; 1804 or return;
1431 $self->prepare_orig; 1805 $self->prepare_orig;
1432 } 1806 }
1433 1807
1808 $self->{deny_reset} = 1
1809 if $self->no_reset;
1810
1434 $self->default_region (cf::region::find_by_path $self->{path}) 1811 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region; 1812 unless $self->default_region;
1436 1813
1437 1 1814 1
1438} 1815}
1453 $map->{last_save} = $cf::RUNTIME; 1830 $map->{last_save} = $cf::RUNTIME;
1454 1831
1455 $map->load_header 1832 $map->load_header
1456 or return; 1833 or return;
1457 1834
1458 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1459 # doing this can freeze the server in a sync job, obviously 1836 # doing this can freeze the server in a sync job, obviously
1460 #$cf::WAIT_FOR_TICK->wait; 1837 #$cf::WAIT_FOR_TICK->wait;
1461 $map->reset; 1838 $map->reset;
1462 undef $guard; 1839 undef $guard;
1463 return find $path; 1840 return find $path;
1474 my ($self) = @_; 1851 my ($self) = @_;
1475 1852
1476 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1477 1854
1478 my $path = $self->{path}; 1855 my $path = $self->{path};
1856
1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1479 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1480 1860
1481 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1482 1862
1483 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1484 1864
1485 $self->alloc; 1865 $self->alloc;
1486 1866
1487 $self->pre_load; 1867 $self->pre_load;
1868 cf::cede_to_tick;
1488 1869
1489 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1490 or return; 1871 or return;
1491 1872
1492 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1493 if delete $self->{load_original}; 1874 if delete $self->{load_original};
1494 1875
1495 if (my $uniq = $self->uniq_path) { 1876 if (my $uniq = $self->uniq_path) {
1496 utf8::encode $uniq; 1877 utf8::encode $uniq;
1497 if (aio_open $uniq, O_RDONLY, 0) { 1878 if (aio_open $uniq, O_RDONLY, 0) {
1498 $self->clear_unique_items; 1879 $self->clear_unique_items;
1499 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1500 } 1881 }
1501 } 1882 }
1502 1883
1503 Coro::cede; 1884 cf::cede_to_tick;
1504
1505 # now do the right thing for maps 1885 # now do the right thing for maps
1506 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1507
1508 unless ($self->{deny_activate}) {
1509 $self->decay_objects;
1510 $self->fix_auto_apply;
1511 $self->update_buttons;
1512 Coro::cede;
1513 $self->set_darkness_map;
1514 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1515 unless $self->difficulty; 1888 unless $self->difficulty;
1516 Coro::cede; 1889 cf::cede_to_tick;
1890
1891 unless ($self->{deny_activate}) {
1892 $self->decay_objects;
1893 $self->fix_auto_apply;
1894 $self->update_buttons;
1895 cf::cede_to_tick;
1896 $self->set_darkness_map;
1897 cf::cede_to_tick;
1517 $self->activate; 1898 $self->activate;
1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1903
1904 $self->in_memory (cf::MAP_IN_MEMORY);
1518 } 1905 }
1519 1906
1520 $self->post_load; 1907 $self->post_load;
1521
1522 $self->in_memory (cf::MAP_IN_MEMORY);
1523} 1908}
1524 1909
1525sub customise_for { 1910sub customise_for {
1526 my ($self, $ob) = @_; 1911 my ($self, $ob) = @_;
1527 1912
1528 return find "~" . $ob->name . "/" . $self->{path} 1913 return find "~" . $ob->name . "/" . $self->{path}
1529 if $self->per_player; 1914 if $self->per_player;
1530 1915
1916# return find "?party/" . $ob->name . "/" . $self->{path}
1917# if $self->per_party;
1918
1531 $self 1919 $self
1532} 1920}
1533 1921
1534# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1535sub load_diag { 1923sub load_neighbours {
1536 my ($map) = @_; 1924 my ($map) = @_;
1537 1925
1538 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1539 1927
1540 for (0 .. 3) { 1928 for (0 .. 3) {
1541 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1542 or next; 1930 or next;
1543 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1544 or next; 1932 or next;
1545 $neigh->load; 1933 $neigh->load;
1546 1934
1935 push @neigh,
1547 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1548 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1549 } 1938 }
1550 1939
1551 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1552 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1553 or next; 1943 or next;
1554 $neigh->load; 1944 $neigh->load;
1555 } 1945 }
1556} 1946}
1557 1947
1562} 1952}
1563 1953
1564sub do_load_sync { 1954sub do_load_sync {
1565 my ($map) = @_; 1955 my ($map) = @_;
1566 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1567 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1568} 1961}
1569 1962
1570our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1571our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1572 1965
1573sub find_async { 1966sub find_async {
1574 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1575 1968
1576 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1577 1970
1578 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1579 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1580 } 1973 }
1581 1974
1582 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1583 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1584 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1585 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1586 my $map = find $path 1980 if (my $map = find $k) {
1587 or next;
1588 $map->load; 1981 $map->load if $v;
1982 }
1589 1983
1590 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1591 } 1985 }
1592 } 1986 }
1593 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1594 }; 1988 };
1595 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
1598} 1992}
1599 1993
1600sub save { 1994sub save {
1601 my ($self) = @_; 1995 my ($self) = @_;
1602 1996
1603 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1604 1998
1605 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1606 2000
1607 return unless $self->dirty; 2001 return unless $self->dirty;
1608 2002
1631 my ($self) = @_; 2025 my ($self) = @_;
1632 2026
1633 # save first because save cedes 2027 # save first because save cedes
1634 $self->save; 2028 $self->save;
1635 2029
1636 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1637 2031
1638 return if $self->players; 2032 return if $self->players;
1639 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1640 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1641 2035
1645 2039
1646sub reset_at { 2040sub reset_at {
1647 my ($self) = @_; 2041 my ($self) = @_;
1648 2042
1649 # TODO: safety, remove and allow resettable per-player maps 2043 # TODO: safety, remove and allow resettable per-player maps
1650 return 1e99 if $self->isa ("ext::map_per_player");#d#
1651 return 1e99 if $self->{deny_reset}; 2044 return 1e99 if $self->{deny_reset};
1652 2045
1653 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2046 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1654 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2047 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1655 2048
1666 my ($self) = @_; 2059 my ($self) = @_;
1667 2060
1668 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2061 my $lock = cf::lock_acquire "map_data:$self->{path}";
1669 2062
1670 return if $self->players; 2063 return if $self->players;
1671 return if $self->isa ("ext::map_per_player");#d#
1672 2064
1673 warn "resetting map ", $self->path;#d# 2065 warn "resetting map ", $self->path;
1674 2066
1675 $self->in_memory (cf::MAP_SWAPPED); 2067 $self->in_memory (cf::MAP_SWAPPED);
1676 2068
1677 # need to save uniques path 2069 # need to save uniques path
1678 unless ($self->{deny_save}) { 2070 unless ($self->{deny_save}) {
1695my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
1696 2088
1697sub nuke { 2089sub nuke {
1698 my ($self) = @_; 2090 my ($self) = @_;
1699 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
1700 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
1701 2096
1702 $self->unlink_save; 2097 $self->unlink_save;
1703 2098
1704 bless $self, "cf::map"; 2099 bless $self, "cf::map";
1705 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
1706 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
1707 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
1708 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1709 2104
1710 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
1711 2107
1712 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2109}
2110
2111=item $maps = cf::map::tmp_maps
2112
2113Returns an arrayref with all map paths of currently instantiated and saved
2114maps. May block.
2115
2116=cut
2117
2118sub tmp_maps() {
2119 [
2120 map {
2121 utf8::decode $_;
2122 /\.map$/
2123 ? normalise $_
2124 : ()
2125 } @{ aio_readdir $TMPDIR or [] }
2126 ]
2127}
2128
2129=item $maps = cf::map::random_maps
2130
2131Returns an arrayref with all map paths of currently instantiated and saved
2132random maps. May block.
2133
2134=cut
2135
2136sub random_maps() {
2137 [
2138 map {
2139 utf8::decode $_;
2140 /\.map$/
2141 ? normalise "?random/$_"
2142 : ()
2143 } @{ aio_readdir $RANDOMDIR or [] }
2144 ]
1713} 2145}
1714 2146
1715=item cf::map::unique_maps 2147=item cf::map::unique_maps
1716 2148
1717Returns an arrayref of paths of all shared maps that have 2149Returns an arrayref of paths of all shared maps that have
1718instantiated unique items. May block. 2150instantiated unique items. May block.
1719 2151
1720=cut 2152=cut
1721 2153
1722sub unique_maps() { 2154sub unique_maps() {
1723 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2155 [
1724 or return; 2156 map {
1725
1726 my @paths;
1727
1728 for (@$files) {
1729 utf8::decode $_; 2157 utf8::decode $_;
1730 next if /\.pst$/; 2158 /\.map$/
1731 next unless /^$PATH_SEP/o; 2159 ? normalise $_
1732 2160 : ()
1733 push @paths, cf::map::normalise $_; 2161 } @{ aio_readdir $UNIQUEDIR or [] }
1734 } 2162 ]
1735
1736 \@paths
1737} 2163}
1738 2164
1739package cf; 2165package cf;
1740 2166
1741=back 2167=back
1787 2213
1788 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2214 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1789 2215
1790 if ($self->{record_replies}) { 2216 if ($self->{record_replies}) {
1791 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2217 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2218
1792 } else { 2219 } else {
2220 my $pl = $self->contr;
2221
2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2223 my $dialog = $pl->{npc_dialog};
2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2225
2226 } else {
1793 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
1794 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2229 }
1795 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
1796} 2241}
1797 2242
1798=item $player_object->may ("access") 2243=item $player_object->may ("access")
1799 2244
1800Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
1847 $self->deactivate_recursive; 2292 $self->deactivate_recursive;
1848 2293
1849 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2294 return if UNIVERSAL::isa $self->map, "ext::map_link";
1850 2295
1851 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2296 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1852 if $self->map; 2297 if $self->map && $self->map->{path} ne "{link}";
1853 2298
1854 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2299 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1855} 2300}
1856 2301
1857sub cf::object::player::leave_link { 2302sub cf::object::player::leave_link {
1858 my ($self, $map, $x, $y) = @_; 2303 my ($self, $map, $x, $y) = @_;
2304
2305 return unless $self->contr->active;
1859 2306
1860 my $link_pos = delete $self->{_link_pos}; 2307 my $link_pos = delete $self->{_link_pos};
1861 2308
1862 unless ($map) { 2309 unless ($map) {
1863 # restore original map position 2310 # restore original map position
1877 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
1878 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
1879 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
1880 2327
1881 $map->load; 2328 $map->load;
1882 $map->load_diag; 2329 $map->load_neighbours;
1883 2330
1884 return unless $self->contr->active; 2331 return unless $self->contr->active;
1885 $self->activate_recursive; 2332 $self->activate_recursive;
1886 2333
1887 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1888 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
1889} 2336}
1890 2337
1891cf::player->attach ( 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1892 on_logout => sub {
1893 my ($pl) = @_;
1894 2339
1895 # abort map switching before logout 2340Moves the player to the given map-path and coordinates by first freezing
1896 if ($pl->ob->{_link_pos}) { 2341her, loading and preparing them map, calling the provided $check callback
1897 cf::sync_job { 2342that has to return the map if sucecssful, and then unfreezes the player on
1898 $pl->ob->leave_link 2343the new (success) or old (failed) map position. In either case, $done will
1899 }; 2344be called at the end of this process.
1900 }
1901 },
1902 on_login => sub {
1903 my ($pl) = @_;
1904 2345
1905 # try to abort aborted map switching on player login :)
1906 # should happen only on crashes
1907 if ($pl->ob->{_link_pos}) {
1908 $pl->ob->enter_link;
1909 (async {
1910 $pl->ob->reply (undef,
1911 "There was an internal problem at your last logout, "
1912 . "the server will try to bring you to your intended destination in a second.",
1913 cf::NDI_RED);
1914 # we need this sleep as the login has a concurrent enter_exit running
1915 # and this sleep increases chances of the player not ending up in scorn
1916 Coro::Timer::sleep 1;
1917 $pl->ob->leave_link;
1918 })->prio (2);
1919 }
1920 },
1921);
1922
1923=item $player_object->goto ($path, $x, $y)
1924
1925=cut 2346=cut
2347
2348our $GOTOGEN;
1926 2349
1927sub cf::object::player::goto { 2350sub cf::object::player::goto {
1928 my ($self, $path, $x, $y) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2352
2353 # do generation counting so two concurrent goto's will be executed in-order
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1929 2355
1930 $self->enter_link; 2356 $self->enter_link;
1931 2357
1932 (async { 2358 (async {
1933 my $map = eval { 2359 my $map = eval {
1934 my $map = cf::map::find $path; 2360 my $map = cf::map::find $path;
2361
2362 if ($map) {
1935 $map = $map->customise_for ($self) if $map; 2363 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map;
2365 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2367 }
2368
1936 $map 2369 $map
2370 };
2371
2372 if ($@) {
2373 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2374 LOG llevError | logBacktrace, Carp::longmess $@;
1937 } or 2375 }
1938 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1939 2376
2377 if ($gen == $self->{_goto_generation}) {
2378 delete $self->{_goto_generation};
1940 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2380 }
2381
2382 $done->() if $done;
1941 })->prio (1); 2383 })->prio (1);
1942} 2384}
1943 2385
1944=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
1945 2387
1984 2426
1985 $rmp->{random_seed} ||= $exit->random_seed; 2427 $rmp->{random_seed} ||= $exit->random_seed;
1986 2428
1987 my $data = cf::to_json $rmp; 2429 my $data = cf::to_json $rmp;
1988 my $md5 = Digest::MD5::md5_hex $data; 2430 my $md5 = Digest::MD5::md5_hex $data;
1989 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2431 my $meta = "$RANDOMDIR/$md5.meta";
1990 2432
1991 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1992 aio_write $fh, 0, (length $data), $data, 0; 2434 aio_write $fh, 0, (length $data), $data, 0;
1993 undef $fh; 2435 undef $fh;
1994 aio_rename "$meta~", $meta; 2436 aio_rename "$meta~", $meta;
2013 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2455 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2014 my $hp = $exit->stats->hp; 2456 my $hp = $exit->stats->hp;
2015 my $sp = $exit->stats->sp; 2457 my $sp = $exit->stats->sp;
2016 2458
2017 $self->enter_link; 2459 $self->enter_link;
2460
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
2018 2464
2019 (async { 2465 (async {
2020 $self->deactivate_recursive; # just to be sure 2466 $self->deactivate_recursive; # just to be sure
2021 unless (eval { 2467 unless (eval {
2022 $self->goto ($slaying, $hp, $sp); 2468 $self->goto ($slaying, $hp, $sp);
2050 2496
2051 utf8::encode $text; 2497 utf8::encode $text;
2052 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2053} 2499}
2054 2500
2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2502
2503Send a drawinfo or msg packet to the client, formatting the msg for the
2504client if neccessary. C<$type> should be a string identifying the type of
2505the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet.
2507
2508=cut
2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2525sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_;
2527
2528 $msg = $self->pl->expand_cfpod ($msg);
2529
2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2541 }
2542
2543 $channel = $channel->{id};
2544 }
2545
2546 return unless @extra || length $msg;
2547
2548 if ($self->can_msg) {
2549 # default colour, mask it out
2550 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2551 if $color & cf::NDI_DEF;
2552
2553 $self->send_packet ("msg " . $self->{json_coder}->encode (
2554 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2555 } else {
2556 if ($color >= 0) {
2557 # replace some tags by gcfclient-compatible ones
2558 for ($msg) {
2559 1 while
2560 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2561 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2562 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2563 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2564 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2565 }
2566
2567 $color &= cf::NDI_COLOR_MASK;
2568
2569 utf8::encode $msg;
2570
2571 if (0 && $msg =~ /\[/) {
2572 # COMMAND/INFO
2573 $self->send_packet ("drawextinfo $color 10 8 $msg")
2574 } else {
2575 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2576 $self->send_packet ("drawinfo $color $msg")
2577 }
2578 }
2579 }
2580}
2581
2055=item $client->ext_event ($type, %msg) 2582=item $client->ext_msg ($type, @msg)
2056 2583
2057Sends an exti event to the client. 2584Sends an ext event to the client.
2058 2585
2059=cut 2586=cut
2060 2587
2061sub cf::client::ext_event($$%) { 2588sub cf::client::ext_msg($$@) {
2062 my ($self, $type, %msg) = @_; 2589 my ($self, $type, @msg) = @_;
2063 2590
2591 if ($self->extcmd == 2) {
2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2593 } elsif ($self->extcmd == 1) { # TODO: remove
2064 $msg{msgtype} = "event_$type"; 2594 push @msg, msgtype => "event_$type";
2065 $self->send_packet ("ext " . cf::to_json \%msg); 2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2596 }
2597}
2598
2599=item $client->ext_reply ($msgid, @msg)
2600
2601Sends an ext reply to the client.
2602
2603=cut
2604
2605sub cf::client::ext_reply($$@) {
2606 my ($self, $id, @msg) = @_;
2607
2608 if ($self->extcmd == 2) {
2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2610 } elsif ($self->extcmd == 1) {
2611 #TODO: version 1, remove
2612 unshift @msg, msgtype => "reply", msgid => $id;
2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2614 }
2066} 2615}
2067 2616
2068=item $success = $client->query ($flags, "text", \&cb) 2617=item $success = $client->query ($flags, "text", \&cb)
2069 2618
2070Queues a query to the client, calling the given callback with 2619Queues a query to the client, calling the given callback with
2071the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2620the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2072C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2621C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2073 2622
2074Queries can fail, so check the return code. Or don't, as queries will become 2623Queries can fail, so check the return code. Or don't, as queries will
2075reliable at some point in the future. 2624become reliable at some point in the future.
2076 2625
2077=cut 2626=cut
2078 2627
2079sub cf::client::query { 2628sub cf::client::query {
2080 my ($self, $flags, $text, $cb) = @_; 2629 my ($self, $flags, $text, $cb) = @_;
2088 utf8::encode $text; 2637 utf8::encode $text;
2089 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2638 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2090 2639
2091 $self->send_packet ($self->{query_queue}[0][0]) 2640 $self->send_packet ($self->{query_queue}[0][0])
2092 if @{ $self->{query_queue} } == 1; 2641 if @{ $self->{query_queue} } == 1;
2642
2643 1
2093} 2644}
2094 2645
2095cf::client->attach ( 2646cf::client->attach (
2647 on_connect => sub {
2648 my ($ns) = @_;
2649
2650 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2651 },
2096 on_reply => sub { 2652 on_reply => sub {
2097 my ($ns, $msg) = @_; 2653 my ($ns, $msg) = @_;
2098 2654
2099 # this weird shuffling is so that direct followup queries 2655 # this weird shuffling is so that direct followup queries
2100 # get handled first 2656 # get handled first
2112 } else { 2668 } else {
2113 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2669 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2114 } 2670 }
2115 } 2671 }
2116 }, 2672 },
2673 on_exticmd => sub {
2674 my ($ns, $buf) = @_;
2675
2676 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2677
2678 if (ref $msg) {
2679 my ($type, $reply, @payload) =
2680 "ARRAY" eq ref $msg
2681 ? @$msg
2682 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2683
2684 my @reply;
2685
2686 if (my $cb = $EXTICMD{$type}) {
2687 @reply = $cb->($ns, @payload);
2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2693 } else {
2694 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2695 }
2696
2697 cf::override;
2698 },
2117); 2699);
2118 2700
2119=item $client->async (\&cb) 2701=item $client->async (\&cb)
2120 2702
2121Create a new coroutine, running the specified callback. The coroutine will 2703Create a new coroutine, running the specified callback. The coroutine will
2162our $safe = new Safe "safe"; 2744our $safe = new Safe "safe";
2163our $safe_hole = new Safe::Hole; 2745our $safe_hole = new Safe::Hole;
2164 2746
2165$SIG{FPE} = 'IGNORE'; 2747$SIG{FPE} = 'IGNORE';
2166 2748
2167$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2749$safe->permit_only (Opcode::opset qw(
2750 :base_core :base_mem :base_orig :base_math
2751 grepstart grepwhile mapstart mapwhile
2752 sort time
2753));
2168 2754
2169# here we export the classes and methods available to script code 2755# here we export the classes and methods available to script code
2170 2756
2171=pod 2757=pod
2172 2758
2173The following functions and methods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2174 2760
2175 cf::object contr pay_amount pay_player map 2761 cf::object
2762 contr pay_amount pay_player map x y force_find force_add
2763 insert remove name archname title slaying race decrease_ob_nr
2764
2176 cf::object::player player 2765 cf::object::player
2177 cf::player peaceful 2766 player
2178 cf::map trigger 2767
2768 cf::player
2769 peaceful
2770
2771 cf::map
2772 trigger
2179 2773
2180=cut 2774=cut
2181 2775
2182for ( 2776for (
2183 ["cf::object" => qw(contr pay_amount pay_player map)], 2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2778 insert remove inv name archname title slaying race
2779 decrease_ob_nr)],
2184 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2185 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2186 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2187) { 2783) {
2188 no strict 'refs'; 2784 no strict 'refs';
2259=back 2855=back
2260 2856
2261=cut 2857=cut
2262 2858
2263############################################################################# 2859#############################################################################
2264
2265=head2 EXTENSION DATABASE SUPPORT
2266
2267Crossfire maintains a very simple database for extension use. It can
2268currently store anything that can be serialised using Storable, which
2269excludes objects.
2270
2271The parameter C<$family> should best start with the name of the extension
2272using it, it should be unique.
2273
2274=over 4
2275
2276=item $value = cf::db_get $family => $key
2277
2278Returns a single value from the database.
2279
2280=item cf::db_put $family => $key => $value
2281
2282Stores the given C<$value> in the family.
2283
2284=cut
2285
2286our $DB;
2287
2288sub db_init {
2289 unless ($DB) {
2290 $DB = BDB::db_create $DB_ENV;
2291
2292 cf::sync_job {
2293 eval {
2294 $DB->set_flags (BDB::CHKSUM);
2295
2296 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2297 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2298 cf::cleanup "db_open(db): $!" if $!;
2299 };
2300 cf::cleanup "db_open(db): $@" if $@;
2301 };
2302
2303 my $path = cf::localdir . "/database.pst";
2304 if (stat $path) {
2305 cf::sync_job {
2306 my $pst = Storable::retrieve $path;
2307
2308 cf::db_put (board => data => $pst->{board});
2309 cf::db_put (guildrules => data => $pst->{guildrules});
2310 cf::db_put (rent => balance => $pst->{rent}{balance});
2311 BDB::db_env_txn_checkpoint $DB_ENV;
2312
2313 unlink $path;
2314 };
2315 }
2316 }
2317}
2318
2319sub db_get($$) {
2320 my $key = "$_[0]/$_[1]";
2321
2322 cf::sync_job {
2323 BDB::db_get $DB, undef, $key, my $data;
2324
2325 $! ? ()
2326 : Compress::LZF::sthaw $data
2327 }
2328}
2329
2330sub db_put($$$) {
2331 BDB::dbreq_pri 4;
2332 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2333}
2334
2335#############################################################################
2336# the server's init and main functions 2860# the server's init and main functions
2337 2861
2338sub load_facedata { 2862sub load_facedata($) {
2339 my $path = sprintf "%s/facedata", cf::datadir; 2863 my ($path) = @_;
2864
2865 # HACK to clear player env face cache, we need some signal framework
2866 # for this (global event?)
2867 %ext::player_env::MUSIC_FACE_CACHE = ();
2868
2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2340 2870
2341 warn "loading facedata from $path\n"; 2871 warn "loading facedata from $path\n";
2342 2872
2343 my $facedata; 2873 my $facedata;
2344 0 < aio_load $path, $facedata 2874 0 < aio_load $path, $facedata
2347 $facedata = Coro::Storable::thaw $facedata; 2877 $facedata = Coro::Storable::thaw $facedata;
2348 2878
2349 $facedata->{version} == 2 2879 $facedata->{version} == 2
2350 or cf::cleanup "$path: version mismatch, cannot proceed."; 2880 or cf::cleanup "$path: version mismatch, cannot proceed.";
2351 2881
2882 # patch in the exptable
2883 $facedata->{resource}{"res/exp_table"} = {
2884 type => FT_RSRC,
2885 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2886 };
2887 cf::cede_to_tick;
2888
2352 { 2889 {
2353 my $faces = $facedata->{faceinfo}; 2890 my $faces = $facedata->{faceinfo};
2354 2891
2355 while (my ($face, $info) = each %$faces) { 2892 while (my ($face, $info) = each %$faces) {
2356 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2893 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2357 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2894 cf::face::set_visibility $idx, $info->{visibility};
2895 cf::face::set_magicmap $idx, $info->{magicmap};
2358 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2359 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2360 Coro::cede; 2898
2899 cf::cede_to_tick;
2361 } 2900 }
2362 2901
2363 while (my ($face, $info) = each %$faces) { 2902 while (my ($face, $info) = each %$faces) {
2364 next unless $info->{smooth}; 2903 next unless $info->{smooth};
2365 my $idx = cf::face::find $face 2904 my $idx = cf::face::find $face
2366 or next; 2905 or next;
2367 if (my $smooth = cf::face::find $info->{smooth}) { 2906 if (my $smooth = cf::face::find $info->{smooth}) {
2907 cf::face::set_smooth $idx, $smooth;
2368 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2908 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2369 } else { 2909 } else {
2370 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2910 warn "smooth face '$info->{smooth}' not found for face '$face'";
2371 } 2911 }
2372 Coro::cede; 2912
2913 cf::cede_to_tick;
2373 } 2914 }
2374 } 2915 }
2375 2916
2376 { 2917 {
2377 my $anims = $facedata->{animinfo}; 2918 my $anims = $facedata->{animinfo};
2378 2919
2379 while (my ($anim, $info) = each %$anims) { 2920 while (my ($anim, $info) = each %$anims) {
2380 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2921 cf::anim::set $anim, $info->{frames}, $info->{facings};
2381 Coro::cede; 2922 cf::cede_to_tick;
2382 } 2923 }
2383 2924
2384 cf::anim::invalidate_all; # d'oh 2925 cf::anim::invalidate_all; # d'oh
2385 } 2926 }
2386 2927
2928 {
2929 # TODO: for gcfclient pleasure, we should give resources
2930 # that gcfclient doesn't grok a >10000 face index.
2931 my $res = $facedata->{resource};
2932
2933 my $soundconf = delete $res->{"res/sound.conf"};
2934
2935 while (my ($name, $info) = each %$res) {
2936 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data;
2938
2939 if ($info->{type} & 1) {
2940 # prepend meta info
2941
2942 my $meta = $enc->encode ({
2943 name => $name,
2944 %{ $info->{meta} || {} },
2945 });
2946
2947 $data = pack "(w/a*)*", $meta, $info->{data};
2948 } else {
2949 $data = $info->{data};
2950 }
2951
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2953 cf::face::set_type $idx, $info->{type};
2954
2955 cf::cede_to_tick;
2956 }
2957
2958 if ($soundconf) {
2959 $soundconf = $enc->decode (delete $soundconf->{data});
2960
2961 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2962 my $sound = $soundconf->{compat}[$_]
2963 or next;
2964
2965 my $face = cf::face::find "sound/$sound->[1]";
2966 cf::sound::set $sound->[0] => $face;
2967 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2968 }
2969
2970 while (my ($k, $v) = each %{$soundconf->{event}}) {
2971 my $face = cf::face::find "sound/$v";
2972 cf::sound::set $k => $face;
2973 }
2974 }
2975 }
2976
2387 1 2977 1
2388} 2978}
2389 2979
2980register_exticmd fx_want => sub {
2981 my ($ns, $want) = @_;
2982
2983 while (my ($k, $v) = each %$want) {
2984 $ns->fx_want ($k, $v);
2985 }
2986};
2987
2988sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2993 load_resource_file "$MAPDIR/regions"
2994 or die "unable to load regions file\n";
2995
2996 for (cf::region::list) {
2997 $_->{match} = qr/$_->{match}/
2998 if exists $_->{match};
2999 }
3000}
3001
3002sub reload_facedata {
3003 load_facedata "$DATADIR/facedata"
3004 or die "unable to load facedata\n";
3005}
3006
3007sub reload_archetypes {
3008 load_resource_file "$DATADIR/archetypes"
3009 or die "unable to load archetypes\n";
3010 #d# NEED to laod twice to resolve forward references
3011 # this really needs to be done in an extra post-pass
3012 # (which needs to be synchronous, so solve it differently)
3013 load_resource_file "$DATADIR/archetypes"
3014 or die "unable to load archetypes\n";
3015}
3016
3017sub reload_treasures {
3018 load_resource_file "$DATADIR/treasures"
3019 or die "unable to load treasurelists\n";
3020}
3021
2390sub reload_resources { 3022sub reload_resources {
2391 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3023 warn "reloading resource files...\n";
2392 or die "unable to load regions file\n";#d# 3024
3025 reload_regions;
2393 load_facedata 3026 reload_facedata;
2394 or die "unable to load facedata\n";#d# 3027 #reload_archetypes;#d#
3028 reload_archetypes;
3029 reload_treasures;
3030
3031 warn "finished reloading resource files\n";
2395} 3032}
2396 3033
2397sub init { 3034sub init {
2398 reload_resources; 3035 reload_resources;
2399} 3036}
2400 3037
2401sub cfg_load { 3038sub reload_config {
2402 open my $fh, "<:utf8", cf::confdir . "/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
2403 or return; 3040 or return;
2404 3041
2405 local $/; 3042 local $/;
2406 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
2407 3044
2426 (async { 3063 (async {
2427 Event::one_event; 3064 Event::one_event;
2428 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
2429 }; 3066 };
2430 3067
2431 cfg_load; 3068 reload_config;
2432 db_init; 3069 db_init;
2433 load_extensions; 3070 load_extensions;
2434 3071
2435 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
2436 Event::loop; 3073 Event::loop;
2452 }, 3089 },
2453 ); 3090 );
2454 } 3091 }
2455} 3092}
2456 3093
3094sub write_runtime {
3095 my $runtime = "$LOCALDIR/runtime";
3096
3097 # first touch the runtime file to show we are still running:
3098 # the fsync below can take a very very long time.
3099
3100 IO::AIO::aio_utime $runtime, undef, undef;
3101
3102 my $guard = cf::lock_acquire "write_runtime";
3103
3104 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3105 or return;
3106
3107 my $value = $cf::RUNTIME + 90 + 10;
3108 # 10 is the runtime save interval, for a monotonic clock
3109 # 60 allows for the watchdog to kill the server.
3110
3111 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3112 and return;
3113
3114 # always fsync - this file is important
3115 aio_fsync $fh
3116 and return;
3117
3118 # touch it again to show we are up-to-date
3119 aio_utime $fh, undef, undef;
3120
3121 close $fh
3122 or return;
3123
3124 aio_rename "$runtime~", $runtime
3125 and return;
3126
3127 warn "runtime file written.\n";
3128
3129 1
3130}
3131
2457sub emergency_save() { 3132sub emergency_save() {
2458 my $freeze_guard = cf::freeze_mainloop; 3133 my $freeze_guard = cf::freeze_mainloop;
2459 3134
2460 warn "enter emergency perl save\n"; 3135 warn "enter emergency perl save\n";
2461 3136
2492 3167
2493 warn Carp::longmess "post_cleanup backtrace" 3168 warn Carp::longmess "post_cleanup backtrace"
2494 if $make_core; 3169 if $make_core;
2495} 3170}
2496 3171
2497sub reload() { 3172sub do_reload_perl() {
2498 # can/must only be called in main 3173 # can/must only be called in main
2499 if ($Coro::current != $Coro::main) { 3174 if ($Coro::current != $Coro::main) {
2500 warn "can only reload from main coroutine"; 3175 warn "can only reload from main coroutine";
2501 return; 3176 return;
2502 } 3177 }
2536 %EXT_CORO = (); 3211 %EXT_CORO = ();
2537 3212
2538 warn "removing commands"; 3213 warn "removing commands";
2539 %COMMAND = (); 3214 %COMMAND = ();
2540 3215
2541 warn "removing ext commands"; 3216 warn "removing ext/exti commands";
2542 %EXTCMD = (); 3217 %EXTCMD = ();
3218 %EXTICMD = ();
2543 3219
2544 warn "unloading/nuking all extensions"; 3220 warn "unloading/nuking all extensions";
2545 for my $pkg (@EXTS) { 3221 for my $pkg (@EXTS) {
2546 warn "... unloading $pkg"; 3222 warn "... unloading $pkg";
2547 3223
2577 Symbol::delete_package "safe::$_" 3253 Symbol::delete_package "safe::$_"
2578 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3254 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2579 3255
2580 warn "unloading cf.pm \"a bit\""; 3256 warn "unloading cf.pm \"a bit\"";
2581 delete $INC{"cf.pm"}; 3257 delete $INC{"cf.pm"};
3258 delete $INC{"cf/pod.pm"};
2582 3259
2583 # don't, removes xs symbols, too, 3260 # don't, removes xs symbols, too,
2584 # and global variables created in xs 3261 # and global variables created in xs
2585 #Symbol::delete_package __PACKAGE__; 3262 #Symbol::delete_package __PACKAGE__;
2586 3263
2589 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
2590 require cf; 3267 require cf;
2591 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2592 3269
2593 warn "loading config and database again"; 3270 warn "loading config and database again";
2594 cf::cfg_load; 3271 cf::reload_config;
2595 3272
2596 warn "loading extensions"; 3273 warn "loading extensions";
2597 cf::load_extensions; 3274 cf::load_extensions;
2598 3275
2599 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";
2601 warn "reattaching attachments to maps"; 3278 warn "reattaching attachments to maps";
2602 reattach $_ for values %MAP; 3279 reattach $_ for values %MAP;
2603 warn "reattaching attachments to players"; 3280 warn "reattaching attachments to players";
2604 reattach $_ for values %PLAYER; 3281 reattach $_ for values %PLAYER;
2605 3282
2606 warn "loading reloadable resources";
2607 reload_resources;
2608
2609 warn "leaving sync_job"; 3283 warn "leaving sync_job";
2610 3284
2611 1 3285 1
2612 } or do { 3286 } or do {
2613 warn $@; 3287 warn $@;
2618 warn "reloaded"; 3292 warn "reloaded";
2619}; 3293};
2620 3294
2621our $RELOAD_WATCHER; # used only during reload 3295our $RELOAD_WATCHER; # used only during reload
2622 3296
3297sub reload_perl() {
3298 # doing reload synchronously and two reloads happen back-to-back,
3299 # coro crashes during coro_state_free->destroy here.
3300
3301 $RELOAD_WATCHER ||= Event->timer (
3302 reentrant => 0,
3303 after => 0,
3304 data => WF_AUTOCANCEL,
3305 cb => sub {
3306 do_reload_perl;
3307 undef $RELOAD_WATCHER;
3308 },
3309 );
3310}
3311
2623register_command "reload" => sub { 3312register_command "reload" => sub {
2624 my ($who, $arg) = @_; 3313 my ($who, $arg) = @_;
2625 3314
2626 if ($who->flag (FLAG_WIZ)) { 3315 if ($who->flag (FLAG_WIZ)) {
2627 $who->message ("reloading server."); 3316 $who->message ("reloading server.");
2628 3317 async { reload_perl };
2629 # doing reload synchronously and two reloads happen back-to-back,
2630 # coro crashes during coro_state_free->destroy here.
2631
2632 $RELOAD_WATCHER ||= Event->timer (
2633 reentrant => 0,
2634 after => 0,
2635 data => WF_AUTOCANCEL,
2636 cb => sub {
2637 reload;
2638 undef $RELOAD_WATCHER;
2639 },
2640 );
2641 } 3318 }
2642}; 3319};
2643 3320
2644unshift @INC, $LIBDIR; 3321unshift @INC, $LIBDIR;
2645 3322
2646my $bug_warning = 0; 3323my $bug_warning = 0;
2647 3324
3325our @WAIT_FOR_TICK;
3326our @WAIT_FOR_TICK_BEGIN;
3327
3328sub wait_for_tick {
3329 return unless $TICK_WATCHER->is_active;
3330 return if $Coro::current == $Coro::main;
3331
3332 my $signal = new Coro::Signal;
3333 push @WAIT_FOR_TICK, $signal;
3334 $signal->wait;
3335}
3336
3337sub wait_for_tick_begin {
3338 return unless $TICK_WATCHER->is_active;
3339 return if $Coro::current == $Coro::main;
3340
3341 my $signal = new Coro::Signal;
3342 push @WAIT_FOR_TICK_BEGIN, $signal;
3343 $signal->wait;
3344}
3345
3346 my $min = 1e6;#d#
3347 my $avg = 10;
2648$TICK_WATCHER = Event->timer ( 3348$TICK_WATCHER = Event->timer (
2649 reentrant => 0, 3349 reentrant => 0,
2650 parked => 1, 3350 parked => 1,
2651 prio => 0, 3351 prio => 0,
2652 at => $NEXT_TICK || $TICK, 3352 at => $NEXT_TICK || $TICK,
2656 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3356 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2657 unless ++$bug_warning > 10; 3357 unless ++$bug_warning > 10;
2658 return; 3358 return;
2659 } 3359 }
2660 3360
2661 $NOW = Event::time; 3361 $NOW = $tick_start = Event::time;
2662 3362
2663 cf::server_tick; # one server iteration 3363 cf::server_tick; # one server iteration
3364
3365 0 && sync_job {#d#
3366 for(1..10) {
3367 my $t = Event::time;
3368 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3369 or die;
3370
3371 $map->width (50);
3372 $map->height (50);
3373 $map->alloc;
3374 $map->_load_objects ("/tmp/x.map", 1);
3375 my $t = Event::time - $t;
3376
3377 #next unless $t < 0.0013;#d#
3378 if ($t < $min) {
3379 $min = $t;
3380 }
3381 $avg = $avg * 0.99 + $t * 0.01;
3382 }
3383 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3384 exit 0;
3385 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3386 };
3387
2664 $RUNTIME += $TICK; 3388 $RUNTIME += $TICK;
2665 $NEXT_TICK += $TICK; 3389 $NEXT_TICK += $TICK;
2666 3390
2667 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3391 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2668 $NEXT_RUNTIME_WRITE = $NOW + 10; 3392 $NEXT_RUNTIME_WRITE = $NOW + 10;
2670 write_runtime 3394 write_runtime
2671 or warn "ERROR: unable to write runtime file: $!"; 3395 or warn "ERROR: unable to write runtime file: $!";
2672 }; 3396 };
2673 } 3397 }
2674 3398
2675 $WAIT_FOR_TICK->broadcast;
2676 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2677
2678# my $AFTER = Event::time; 3399# my $AFTER = Event::time;
2679# warn $AFTER - $NOW;#d# 3400# warn $AFTER - $NOW;#d#
2680 3401
3402 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3403 $sig->send;
3404 }
3405 while (my $sig = shift @WAIT_FOR_TICK) {
3406 $sig->send;
3407 }
3408
3409 $NOW = Event::time;
3410
2681 # if we are delayed by four ticks or more, skip them all 3411 # if we are delayed by four ticks or more, skip them all
2682 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3412 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2683 3413
2684 $TICK_WATCHER->at ($NEXT_TICK); 3414 $TICK_WATCHER->at ($NEXT_TICK);
2685 $TICK_WATCHER->start; 3415 $TICK_WATCHER->start;
3416
3417 $LOAD = ($NOW - $tick_start) / $TICK;
3418 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3419
3420 _post_tick;
3421
3422
2686 }, 3423 },
2687); 3424);
2688 3425
2689{ 3426{
2690 BDB::max_poll_time $TICK * 0.1; 3427 BDB::max_poll_time $TICK * 0.1;
2718 3455
2719 cf::sync_job { 3456 cf::sync_job {
2720 eval { 3457 eval {
2721 BDB::db_env_open 3458 BDB::db_env_open
2722 $DB_ENV, 3459 $DB_ENV,
2723 $BDB_ENV_DIR, 3460 $BDBDIR,
2724 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3461 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2725 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3462 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2726 0666; 3463 0666;
2727 3464
2728 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3465 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2729 3466
2730 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3467 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2731 $DB_ENV->set_lk_detect; 3468 $DB_ENV->set_lk_detect;
2732 }; 3469 };
2733 3470
2749 prio => 6, 3486 prio => 6,
2750 cb => \&IO::AIO::poll_cb, 3487 cb => \&IO::AIO::poll_cb,
2751 ); 3488 );
2752} 3489}
2753 3490
3491my $_log_backtrace;
3492
3493sub _log_backtrace {
3494 my ($msg, @addr) = @_;
3495
3496 $msg =~ s/\n//;
3497
3498 # limit the # of concurrent backtraces
3499 if ($_log_backtrace < 2) {
3500 ++$_log_backtrace;
3501 async {
3502 my @bt = fork_call {
3503 @addr = map { sprintf "%x", $_ } @addr;
3504 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3505 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3506 or die "addr2line: $!";
3507
3508 my @funcs;
3509 my @res = <$fh>;
3510 chomp for @res;
3511 while (@res) {
3512 my ($func, $line) = splice @res, 0, 2, ();
3513 push @funcs, "[$func] $line";
3514 }
3515
3516 @funcs
3517 };
3518
3519 LOG llevInfo, "[ABT] $msg\n";
3520 LOG llevInfo, "[ABT] $_\n" for @bt;
3521 --$_log_backtrace;
3522 };
3523 } else {
3524 LOG llevInfo, "[ABT] $msg\n";
3525 LOG llevInfo, "[ABT] [suppressed]\n";
3526 }
3527}
3528
3529# load additional modules
3530use cf::pod;
3531
2754END { cf::emergency_save } 3532END { cf::emergency_save }
2755 3533
27561 35341
2757 3535

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines