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.186 by root, Sat Jan 20 01:12:39 2007 UTC vs.
Revision 1.358 by root, Fri Sep 7 18:10:52 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;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.4 (); 15use Coro 3.64 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
19 25
26use JSON::XS ();
27use BDB ();
20use Data::Dumper; 28use Data::Dumper;
21use Digest::MD5; 29use Digest::MD5;
22use Fcntl; 30use Fcntl;
31use YAML::Syck ();
23use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF;
35use Digest::MD5 ();
26 36
37# configure various modules to our taste
38#
39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 44
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 46$YAML::Syck::ImplicitUnicode = 1;
33 47
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 49
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51
36our %COMMAND = (); 52our %COMMAND = ();
37our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
38 54
39our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
43 60
61our $RELOAD; # number of reloads so far
44our @EVENT; 62our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 63
47our $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(!)
48our $TICK_WATCHER; 77our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 80our $NEXT_TICK;
52our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off
83
84our $BDB_POLL_WATCHER;
85our $DB_ENV;
53 86
54our %CFG; 87our %CFG;
55 88
56our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 90our $RUNTIME;
58 91
59our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
60our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
61our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random";
63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 95
67# 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 ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 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
70binmode STDOUT; 103binmode STDOUT;
71binmode STDERR; 104binmode STDERR;
72 105
73# read virtual server time, if available 106# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
78} 111}
79 112
80mkdir cf::localdir; 113mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 115
86our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
117
118sub cf::map::normalise;
87 119
88############################################################################# 120#############################################################################
89 121
90=head2 GLOBAL VARIABLES 122=head2 GLOBAL VARIABLES
91 123
98=item $cf::RUNTIME 130=item $cf::RUNTIME
99 131
100The 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
101every server tick. 133every server tick.
102 134
103=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
104 138
105The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
106be 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.
107 143
108=item $cf::NOW 144=item $cf::NOW
109 145
110The time of the last (current) server tick. 146The time of the last (current) server tick.
111 147
112=item $cf::TICK 148=item $cf::TICK
113 149
114The 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.
115 161
116=item %cf::CFG 162=item %cf::CFG
117 163
118Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 165from wherever your confdir points to.
120 166
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
122 168
123These 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
124or 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
125processing 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.
126window 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.
127 178
128=back 179=back
129 180
130=cut 181=cut
131 182
132BEGIN { 183BEGIN {
133 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 185 my $msg = join "", @_;
135 utf8::encode $msg;
136 186
137 $msg .= "\n" 187 $msg .= "\n"
138 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
139 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
140 LOG llevError, $msg; 193 LOG llevError, $msg;
141 }; 194 };
142} 195}
143 196
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148@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';
149@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)
150 204
151# 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
152# within the Safe compartment. 206# within the Safe compartment.
153for my $pkg (qw( 207for my $pkg (qw(
154 cf::global cf::attachable 208 cf::global cf::attachable
162} 216}
163 217
164$Event::DIED = sub { 218$Event::DIED = sub {
165 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
166}; 220};
221
222#############################################################################
167 223
168=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
169 225
170=over 4 226=over 4
171 227
190 $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;
191 $d 247 $d
192 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
193} 249}
194 250
195use JSON::Syck (); # TODO# replace by JSON::PC once working
196
197=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
198 252
199Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
200 254
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
209 256
210Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
211 258
212=cut 259=cut
213 260
214sub to_json($) { 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 262
216 JSON::Syck::Dump $_[0] 263sub to_json ($) { $json_coder->encode ($_[0]) }
217} 264sub from_json ($) { $json_coder->decode ($_[0]) }
218 265
219=item cf::lock_wait $string 266=item cf::lock_wait $string
220 267
221Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
222 269
225Wait 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
226a 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,
227for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
228returned. 275returned.
229 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
230Lock 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
231uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
232 282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
286
233=cut 287=cut
234 288
235our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
236 291
237sub lock_wait($) { 292sub lock_wait($) {
238 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
239 299
240 # wait for lock, if any 300 # wait for lock, if any
241 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
242 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
243 Coro::schedule; 303 Coro::schedule;
249 309
250 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
251 lock_wait $key; 311 lock_wait $key;
252 312
253 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
254 315
255 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
256 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
258 } 320 }
259} 321}
260 322
323sub lock_active($) {
324 my ($key) = @_;
325
326 ! ! $LOCK{$key}
327}
328
261sub freeze_mainloop { 329sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 330 return unless $TICK_WATCHER->is_active;
263 331
264 my $guard = Coro::guard { 332 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 333 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 334 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
270 $guard 336 $guard
337}
338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
271} 393}
272 394
273=item cf::async { BLOCK } 395=item cf::async { BLOCK }
274 396
275Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
280 402
281BEGIN { *async = \&Coro::async_pool } 403BEGIN { *async = \&Coro::async_pool }
282 404
283=item cf::sync_job { BLOCK } 405=item cf::sync_job { BLOCK }
284 406
285The design of crossfire+ requires that the main coro ($Coro::main) is 407The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 408is always able to handle events or runnable, as Crossfire TRT is only
287reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable.
288 411
289If it must be done, put the blocking parts into C<sync_job>. This will run 412If it must be done, put the blocking parts into C<sync_job>. This will run
290the given BLOCK in another coroutine while waiting for the result. The 413the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 414server will be frozen during this time, so the block should either finish
292fast or be very important. 415fast or be very important.
295 418
296sub sync_job(&) { 419sub sync_job(&) {
297 my ($job) = @_; 420 my ($job) = @_;
298 421
299 if ($Coro::current == $Coro::main) { 422 if ($Coro::current == $Coro::main) {
423 my $time = Event::time;
424
300 # this is the main coro, too bad, we have to block 425 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 426 # till the operation succeeds, freezing the server :/
302 427
303 # TODO: use suspend/resume instead 428 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 429 # (but this is cancel-safe)
315 440
316 while ($busy) { 441 while ($busy) {
317 Coro::cede or Event::one_event; 442 Coro::cede or Event::one_event;
318 } 443 }
319 444
445 $time = Event::time - $time;
446
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load
451
320 wantarray ? @res : $res[0] 452 wantarray ? @res : $res[0]
321 } else { 453 } else {
322 # we are in another coroutine, how wonderful, everything just works 454 # we are in another coroutine, how wonderful, everything just works
323 455
324 $job->() 456 $job->()
343 $EXT_CORO{$coro+0} = $coro; 475 $EXT_CORO{$coro+0} = $coro;
344 476
345 $coro 477 $coro
346} 478}
347 479
348sub write_runtime { 480=item fork_call { }, $args
349 my $runtime = cf::localdir . "/runtime";
350 481
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 482Executes the given code block with the given arguments in a seperate
352 or return; 483process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling.
353 486
354 my $value = $cf::RUNTIME + 90 + 10; 487=cut
355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357 488
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 489sub fork_call(&@) {
359 and return; 490 my ($cb, @args) = @_;
360 491
361 aio_fsync $fh 492 # we seemingly have to make a local copy of the whole thing,
362 and return; 493 # otherwise perl prematurely frees the stuff :/
494 # TODO: investigate and fix (likely this will be rather laborious)
363 495
364 close $fh 496 my @res = Coro::Util::fork_eval {
365 or return; 497 reset_signals;
498 &$cb
499 }, @args;
366 500
367 aio_rename "$runtime~", $runtime 501 wantarray ? @res : $res[-1]
368 and return; 502}
369 503
504=item $value = cf::db_get $family => $key
505
506Returns a single value from the environment database.
507
508=item cf::db_put $family => $key => $value
509
510Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512
513=cut
514
515our $DB;
516
517sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job {
522 eval {
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
370 1 531 }
532}
533
534sub db_get($$) {
535 my $key = "$_[0]/$_[1]";
536
537 cf::sync_job {
538 BDB::db_get $DB, undef, $key, my $data;
539
540 $! ? ()
541 : $data
542 }
543}
544
545sub db_put($$$) {
546 BDB::dbreq_pri 4;
547 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
548}
549
550=item cf::cache $id => [$paths...], $processversion => $process
551
552Generic caching function that returns the value of the resource $id,
553caching and regenerating as required.
554
555This function can block.
556
557=cut
558
559sub cache {
560 my ($id, $src, $processversion, $process) = @_;
561
562 my $meta =
563 join "\x00",
564 $processversion,
565 map {
566 aio_stat $_
567 and Carp::croak "$_: $!";
568
569 ($_, (stat _)[7,9])
570 } @$src;
571
572 my $dbmeta = db_get cache => "$id/meta";
573 if ($dbmeta ne $meta) {
574 # changed, we may need to process
575
576 my @data;
577 my $md5;
578
579 for (0 .. $#$src) {
580 0 <= aio_load $src->[$_], $data[$_]
581 or Carp::croak "$src->[$_]: $!";
582 }
583
584 # if processing is expensive, check
585 # checksum first
586 if (1) {
587 $md5 =
588 join "\x00",
589 $processversion,
590 map {
591 cf::cede_to_tick;
592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
593 } 0.. $#$src;
594
595
596 my $dbmd5 = db_get cache => "$id/md5";
597 if ($dbmd5 eq $md5) {
598 db_put cache => "$id/meta", $meta;
599
600 return db_get cache => "$id/data";
601 }
602 }
603
604 my $t1 = Time::HiRes::time;
605 my $data = $process->(\@data);
606 my $t2 = Time::HiRes::time;
607
608 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
609
610 db_put cache => "$id/data", $data;
611 db_put cache => "$id/md5" , $md5;
612 db_put cache => "$id/meta", $meta;
613
614 return $data;
615 }
616
617 db_get cache => "$id/data"
618}
619
620=item cf::datalog type => key => value, ...
621
622Log a datalog packet of the given type with the given key-value pairs.
623
624=cut
625
626sub datalog($@) {
627 my ($type, %kv) = @_;
628 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
371} 629}
372 630
373=back 631=back
374 632
375=cut 633=cut
382attach callbacks/event handlers (a collection of which is called an "attachment") 640attach callbacks/event handlers (a collection of which is called an "attachment")
383to it. All such attachable objects support the following methods. 641to it. All such attachable objects support the following methods.
384 642
385In the following description, CLASS can be any of C<global>, C<object> 643In the following description, CLASS can be any of C<global>, C<object>
386C<player>, C<client> or C<map> (i.e. the attachable objects in 644C<player>, C<client> or C<map> (i.e. the attachable objects in
387crossfire+). 645Crossfire TRT).
388 646
389=over 4 647=over 4
390 648
391=item $attachable->attach ($attachment, key => $value...) 649=item $attachable->attach ($attachment, key => $value...)
392 650
555 $registry = $CB_TYPE[$object_type] ||= []; 813 $registry = $CB_TYPE[$object_type] ||= [];
556 814
557 } elsif ($type eq "subtype") { 815 } elsif ($type eq "subtype") {
558 defined $object_type or Carp::croak "subtype specified without type"; 816 defined $object_type or Carp::croak "subtype specified without type";
559 my $object_subtype = shift @arg; 817 my $object_subtype = shift @arg;
560 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 818 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
561 819
562 } elsif ($type eq "package") { 820 } elsif ($type eq "package") {
563 my $pkg = shift @arg; 821 my $pkg = shift @arg;
564 822
565 while (my ($name, $id) = each %cb_id) { 823 while (my ($name, $id) = each %cb_id) {
594 _attach $registry, $klass, @attach; 852 _attach $registry, $klass, @attach;
595 } 853 }
596 854
597 $obj->{$name} = \%arg; 855 $obj->{$name} = \%arg;
598 } else { 856 } else {
599 warn "object uses attachment '$name' that is not available, postponing.\n"; 857 warn "object uses attachment '$name' which is not available, postponing.\n";
600 } 858 }
601 859
602 $obj->{_attachment}{$name} = undef; 860 $obj->{_attachment}{$name} = undef;
603} 861}
604 862
606 if (ref $_[0]) { 864 if (ref $_[0]) {
607 _object_attach @_; 865 _object_attach @_;
608 } else { 866 } else {
609 _attach shift->_attach_registry, @_; 867 _attach shift->_attach_registry, @_;
610 } 868 }
869 _recalc_want;
611}; 870};
612 871
613# all those should be optimised 872# all those should be optimised
614sub cf::attachable::detach { 873sub cf::attachable::detach {
615 my ($obj, $name) = @_; 874 my ($obj, $name) = @_;
618 delete $obj->{_attachment}{$name}; 877 delete $obj->{_attachment}{$name};
619 reattach ($obj); 878 reattach ($obj);
620 } else { 879 } else {
621 Carp::croak "cannot, currently, detach class attachments"; 880 Carp::croak "cannot, currently, detach class attachments";
622 } 881 }
882 _recalc_want;
623}; 883};
624 884
625sub cf::attachable::attached { 885sub cf::attachable::attached {
626 my ($obj, $name) = @_; 886 my ($obj, $name) = @_;
627 887
642 "; 902 ";
643 die if $@; 903 die if $@;
644} 904}
645 905
646our $override; 906our $override;
647our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 907our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
648 908
649sub override { 909sub override {
650 $override = 1; 910 $override = 1;
651 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
652} 912}
653 913
654sub do_invoke { 914sub do_invoke {
655 my $event = shift; 915 my $event = shift;
656 my $callbacks = shift; 916 my $callbacks = shift;
657 917
658 @invoke_results = (); 918 @INVOKE_RESULTS = ();
659 919
660 local $override; 920 local $override;
661 921
662 for (@$callbacks) { 922 for (@$callbacks) {
663 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
680 940
681Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
682 942
683This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 943This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
684removed in future versions), and there is no public API to access override 944removed in future versions), and there is no public API to access override
685results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
686 946
687=back 947=back
688 948
689=cut 949=cut
690 950
691############################################################################# 951#############################################################################
692# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
693 964
694sub reattach { 965sub reattach {
695 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
696 my ($obj) = @_; 967 my ($obj) = @_;
697 968
742); 1013);
743 1014
744sub object_freezer_save { 1015sub object_freezer_save {
745 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
746 1017
1018 my $guard = cf::lock_acquire "io";
1019
747 sync_job { 1020 sync_job {
748 if (length $$rdata) { 1021 if (length $$rdata) {
749 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
750 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
751 1024
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 1026 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 1028 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 1029 close $fh;
757 1030
758 if (@$objs) { 1031 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 1033 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1034 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 1035 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 1036 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 1037 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 1038 aio_rename "$filename.pst~", "$filename.pst";
766 } 1039 }
767 } else { 1040 } else {
768 aio_unlink "$filename.pst"; 1041 aio_unlink "$filename.pst";
774 } 1047 }
775 } else { 1048 } else {
776 aio_unlink $filename; 1049 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
778 } 1051 }
779 } 1052 };
1053
1054 undef $guard;
780} 1055}
781 1056
782sub object_freezer_as_string { 1057sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
784 1059
789 1064
790sub object_thawer_load { 1065sub object_thawer_load {
791 my ($filename) = @_; 1066 my ($filename) = @_;
792 1067
793 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
794 1071
795 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
796 or return; 1073 or return;
797 1074
798 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
799 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
800 or return; 1077 or return;
1078
1079 undef $guard;
801 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
802 } 1081 }
803 1082
804 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
805 $filename, length $data, scalar @{$av || []};#d# 1084 $filename, length $data, scalar @{$av || []};
1085
806 return ($data, $av); 1086 ($data, $av)
807} 1087}
1088
1089=head2 COMMAND CALLBACKS
1090
1091=over 4
1092
1093=cut
808 1094
809############################################################################# 1095#############################################################################
810# command handling &c 1096# command handling &c
811 1097
812=item cf::register_command $name => \&callback($ob,$args); 1098=item cf::register_command $name => \&callback($ob,$args);
825 push @{ $COMMAND{$name} }, [$caller, $cb]; 1111 push @{ $COMMAND{$name} }, [$caller, $cb];
826} 1112}
827 1113
828=item cf::register_extcmd $name => \&callback($pl,$packet); 1114=item cf::register_extcmd $name => \&callback($pl,$packet);
829 1115
830Register a callbackf ro execution when the client sends an extcmd packet. 1116Register a callback for execution when the client sends an (synchronous)
1117extcmd packet. Ext commands will be processed in the order they are
1118received by the server, like other user commands. The first argument is
1119the logged-in player. Ext commands can only be processed after a player
1120has logged in successfully.
831 1121
832If the callback returns something, it is sent back as if reply was being 1122If the callback returns something, it is sent back as if reply was being
833called. 1123called.
834 1124
1125=item cf::register_exticmd $name => \&callback($ns,$packet);
1126
1127Register a callback for execution when the client sends an (asynchronous)
1128exticmd packet. Exti commands are processed by the server as soon as they
1129are received, i.e. out of order w.r.t. other commands. The first argument
1130is a client socket. Exti commands can be received anytime, even before
1131log-in.
1132
1133If the callback returns something, it is sent back as if reply was being
1134called.
1135
835=cut 1136=cut
836 1137
837sub register_extcmd { 1138sub register_extcmd {
838 my ($name, $cb) = @_; 1139 my ($name, $cb) = @_;
839 1140
840 $EXTCMD{$name} = $cb; 1141 $EXTCMD{$name} = $cb;
1142}
1143
1144sub register_exticmd {
1145 my ($name, $cb) = @_;
1146
1147 $EXTICMD{$name} = $cb;
841} 1148}
842 1149
843cf::player->attach ( 1150cf::player->attach (
844 on_command => sub { 1151 on_command => sub {
845 my ($pl, $name, $params) = @_; 1152 my ($pl, $name, $params) = @_;
854 cf::override; 1161 cf::override;
855 }, 1162 },
856 on_extcmd => sub { 1163 on_extcmd => sub {
857 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
858 1165
859 my $msg = eval { from_json $buf }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
860 1167
861 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
862 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
863 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
864 $pl->ext_reply ($msg->{msgid}, %reply);
865 }
866 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
867 } else { 1183 } else {
868 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
869 } 1185 }
870 1186
871 cf::override; 1187 cf::override;
872 }, 1188 },
873); 1189);
874 1190
875sub load_extension {
876 my ($path) = @_;
877
878 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
879 my $base = $1;
880 my $pkg = $1;
881 $pkg =~ s/[^[:word:]]/_/g;
882 $pkg = "ext::$pkg";
883
884 warn "... loading '$path' into '$pkg'\n";
885
886 open my $fh, "<:utf8", $path
887 or die "$path: $!";
888
889 my $source =
890 "package $pkg; use strict; use utf8;\n"
891 . "#line 1 \"$path\"\n{\n"
892 . (do { local $/; <$fh> })
893 . "\n};\n1";
894
895 unless (eval $source) {
896 my $msg = $@ ? "$path: $@\n"
897 : "extension disabled.\n";
898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
899 warn $@;
900 warn "mandatory extension failed to load, exiting.\n";
901 exit 1;
902 }
903 die $@;
904 }
905
906 push @EXTS, $pkg;
907}
908
909sub load_extensions { 1191sub load_extensions {
1192 cf::sync_job {
1193 my %todo;
1194
910 for my $ext (<$LIBDIR/*.ext>) { 1195 for my $path (<$LIBDIR/*.ext>) {
911 next unless -r $ext; 1196 next unless -r $path;
912 eval { 1197
913 load_extension $ext; 1198 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1199 my $base = $1;
1200 my $pkg = $1;
1201 $pkg =~ s/[^[:word:]]/_/g;
1202 $pkg = "ext::$pkg";
1203
1204 open my $fh, "<:utf8", $path
1205 or die "$path: $!";
1206
1207 my $source = do { local $/; <$fh> };
1208
1209 my %ext = (
1210 path => $path,
1211 base => $base,
1212 pkg => $pkg,
1213 );
1214
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217
1218 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n"
1221 . $source
1222 . "\n};\n1";
1223
1224 $todo{$base} = \%ext;
1225 }
1226
1227 my %done;
1228 while (%todo) {
1229 my $progress;
1230
1231 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip
1234 unless exists $done{$_};
1235 }
1236
1237 warn "... loading '$k' into '$v->{pkg}'\n";
1238
1239 unless (eval $v->{source}) {
1240 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n";
1242
1243 if (exists $v->{meta}{mandatory}) {
1244 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n";
1246 exit 1;
1247 }
1248
1249 warn $msg;
1250 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
914 1 1255 }
915 } or warn "$ext not loaded: $@"; 1256
1257 skip:
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1259 unless $progress;
1260 }
916 } 1261 };
917} 1262}
918 1263
919############################################################################# 1264#############################################################################
920 1265
1266=back
1267
921=head2 CORE EXTENSIONS 1268=head2 CORE EXTENSIONS
922 1269
923Functions and methods that extend core crossfire objects. 1270Functions and methods that extend core crossfire objects.
924 1271
925=cut 1272=cut
937Returns the given player object, loading it if necessary (might block). 1284Returns the given player object, loading it if necessary (might block).
938 1285
939=cut 1286=cut
940 1287
941sub playerdir($) { 1288sub playerdir($) {
942 cf::localdir 1289 "$PLAYERDIR/"
943 . "/"
944 . cf::playerdir
945 . "/"
946 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1290 . (ref $_[0] ? $_[0]->ob->name : $_[0])
947} 1291}
948 1292
949sub path($) { 1293sub path($) {
950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1294 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951 1295
952 (playerdir $login) . "/$login.pl" 1296 (playerdir $login) . "/playerdata"
953} 1297}
954 1298
955sub find_active($) { 1299sub find_active($) {
956 $cf::PLAYER{$_[0]} 1300 $cf::PLAYER{$_[0]}
957 and $cf::PLAYER{$_[0]}->active 1301 and $cf::PLAYER{$_[0]}->active
970 my $login = $_[0]; 1314 my $login = $_[0];
971 1315
972 my $guard = cf::lock_acquire "user_find:$login"; 1316 my $guard = cf::lock_acquire "user_find:$login";
973 1317
974 $cf::PLAYER{$_[0]} || do { 1318 $cf::PLAYER{$_[0]} || do {
975 my $pl = load_pl path $login 1319 # rename old playerfiles to new ones
1320 #TODO: remove when no longer required
1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1324 aio_unlink +(playerdir $login) . "/$login.pl";
1325
1326 my $f = new_from_file cf::object::thawer path $login
976 or return; 1327 or return;
1328
1329 $f->next;
1330 my $pl = cf::player::load_pl $f
1331 or return;
1332 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs;
977 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
978 } 1335 }
979 } 1336 }
980} 1337}
981 1338
991 1348
992 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
993 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
994 1351
995 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
996 Coro::cede; 1353 cf::cede_to_tick;
997} 1354}
998 1355
999sub new($) { 1356sub new($) {
1000 my ($login) = @_; 1357 my ($login) = @_;
1001 1358
1007 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1008 1365
1009 $self 1366 $self
1010} 1367}
1011 1368
1369=item $player->send_msg ($channel, $msg, $color, [extra...])
1370
1371=cut
1372
1373sub send_msg {
1374 my $ns = shift->ns
1375 or return;
1376 $ns->send_msg (@_);
1377}
1378
1012=item $pl->quit_character 1379=item $pl->quit_character
1013 1380
1014Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
1015be destroyed. May block for a long time. 1382be destroyed. May block for a long time.
1016 1383
1017=cut 1384=cut
1018 1385
1019sub quit_character { 1386sub quit_character {
1020 my ($pl) = @_; 1387 my ($pl) = @_;
1388
1389 my $name = $pl->ob->name;
1021 1390
1022 $pl->{deny_save} = 1; 1391 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1392 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1393
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1394 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1030 my $path = playerdir $pl; 1399 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1400 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1401 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1402 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1403 $pl->destroy;
1404
1405 my $prefix = qr<^~\Q$name\E/>;
1406
1407 # nuke player maps
1408 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1409
1035 IO::AIO::aio_rmtree $temp; 1410 IO::AIO::aio_rmtree $temp;
1411}
1412
1413=item $pl->kick
1414
1415Kicks a player out of the game. This destroys the connection.
1416
1417=cut
1418
1419sub kick {
1420 my ($pl, $kicker) = @_;
1421
1422 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1423 $pl->killer ("kicked");
1424 $pl->ns->destroy;
1036} 1425}
1037 1426
1038=item cf::player::list_logins 1427=item cf::player::list_logins
1039 1428
1040Returns am arrayref of all valid playernames in the system, can take a 1429Returns am arrayref of all valid playernames in the system, can take a
1041while and may block, so not sync_job-capable, ever. 1430while and may block, so not sync_job-capable, ever.
1042 1431
1043=cut 1432=cut
1044 1433
1045sub list_logins { 1434sub list_logins {
1046 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1435 my $dirs = aio_readdir $PLAYERDIR
1047 or return []; 1436 or return [];
1048 1437
1049 my @logins; 1438 my @logins;
1050 1439
1051 for my $login (@$dirs) { 1440 for my $login (@$dirs) {
1441 my $path = path $login;
1442
1443 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") {
1052 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1053 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1054 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1055 1449
1056 utf8::decode $login; 1450 utf8::decode $login;
1057 push @logins, $login; 1451 push @logins, $login;
1058 } 1452 }
1059 1453
1067 1461
1068=cut 1462=cut
1069 1463
1070sub maps($) { 1464sub maps($) {
1071 my ($pl) = @_; 1465 my ($pl) = @_;
1466
1467 $pl = ref $pl ? $pl->ob->name : $pl;
1072 1468
1073 my $files = aio_readdir playerdir $pl 1469 my $files = aio_readdir playerdir $pl
1074 or return; 1470 or return;
1075 1471
1076 my @paths; 1472 my @paths;
1078 for (@$files) { 1474 for (@$files) {
1079 utf8::decode $_; 1475 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1476 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1477 next unless /^$PATH_SEP/o;
1082 1478
1083 s/\.map$//; 1479 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1480 }
1086 1481
1087 \@paths 1482 \@paths
1088} 1483}
1089 1484
1485=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1486
1487Expand crossfire pod fragments into protocol xml.
1488
1489=cut
1490
1491sub expand_cfpod {
1492 ((my $self), (local $_)) = @_;
1493
1494 # escape & and <
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497
1498 # this is buggy, it needs to properly take care of nested <'s
1499
1500 1 while
1501 # replace B<>, I<>, U<> etc.
1502 s/B<([^\>]*)>/<b>$1<\/b>/
1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1506 # replace G<male|female> tags
1507 || s{G<([^>|]*)\|([^>]*)>}{
1508 $self->gender ? $2 : $1
1509 }ge
1510 # replace H<hint text>
1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1518
1519 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529}
1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1536=item $player->ext_reply ($msgid, @msg)
1091 1537
1092Sends an ext reply to the player. 1538Sends an ext reply to the player.
1093 1539
1094=cut 1540=cut
1095 1541
1096sub ext_reply($$$%) { 1542sub ext_reply($$@) {
1097 my ($self, $id, %msg) = @_; 1543 my ($self, $id, @msg) = @_;
1098 1544
1099 $msg{msgid} = $id; 1545 $self->ns->ext_reply ($id, @msg)
1100
1101 $self->send ("ext " . cf::to_json \%msg);
1102} 1546}
1103 1547
1104package cf; 1548=item $player->ext_msg ($type, @msg)
1549
1550Sends an ext event to the client.
1551
1552=cut
1553
1554sub ext_msg($$@) {
1555 my ($self, $type, @msg) = @_;
1556
1557 $self->ns->ext_msg ($type, @msg);
1558}
1559
1560=head3 cf::region
1561
1562=over 4
1563
1564=cut
1565
1566package cf::region;
1567
1568=item cf::region::find_by_path $path
1569
1570Tries to decuce the likely region for a map knowing only its path.
1571
1572=cut
1573
1574sub find_by_path($) {
1575 my ($path) = @_;
1576
1577 my ($match, $specificity);
1578
1579 for my $region (list) {
1580 if ($region->{match} && $path =~ $region->{match}) {
1581 ($match, $specificity) = ($region, $region->specificity)
1582 if $region->specificity > $specificity;
1583 }
1584 }
1585
1586 $match
1587}
1105 1588
1106=back 1589=back
1107
1108 1590
1109=head3 cf::map 1591=head3 cf::map
1110 1592
1111=over 4 1593=over 4
1112 1594
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1622 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (cf::region::find $rmp->{region}), $rmp->{custom} 1623 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 ) 1624 )
1143} 1625}
1144 1626
1627=item cf::map->register ($regex, $prio)
1628
1629Register a handler for the map path matching the given regex at the
1630givne priority (higher is better, built-in handlers have priority 0, the
1631default).
1632
1633=cut
1634
1145sub register { 1635sub register {
1146 my (undef, $regex) = @_; 1636 my (undef, $regex, $prio) = @_;
1147 my $pkg = caller; 1637 my $pkg = caller;
1148 1638
1149 no strict; 1639 no strict;
1150 push @{"$pkg\::ISA"}, __PACKAGE__; 1640 push @{"$pkg\::ISA"}, __PACKAGE__;
1151 1641
1152 $EXT_MAP{$pkg} = qr<$regex>; 1642 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1153} 1643}
1154 1644
1155# also paths starting with '/' 1645# also paths starting with '/'
1156$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1646$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1157 1647
1158sub thawer_merge { 1648sub thawer_merge {
1159 my ($self, $merge) = @_; 1649 my ($self, $merge) = @_;
1160 1650
1161 # we have to keep some variables in memory intact 1651 # we have to keep some variables in memory intact
1162 local $self->{path}; 1652 local $self->{path};
1163 local $self->{load_path}; 1653 local $self->{load_path};
1164 local $self->{deny_save};
1165 local $self->{deny_reset};
1166 1654
1167 $self->SUPER::thawer_merge ($merge); 1655 $self->SUPER::thawer_merge ($merge);
1168} 1656}
1169 1657
1170sub normalise { 1658sub normalise {
1171 my ($path, $base) = @_; 1659 my ($path, $base) = @_;
1660
1661 $path = "$path"; # make sure its a string
1662
1663 $path =~ s/\.map$//;
1172 1664
1173 # map plan: 1665 # map plan:
1174 # 1666 #
1175 # /! non-realised random map exit (special hack!) 1667 # /! non-realised random map exit (special hack!)
1176 # {... are special paths that are not being touched 1668 # {... are special paths that are not being touched
1204 1696
1205 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1697 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1206 1698
1207 $path = normalise $path, $base; 1699 $path = normalise $path, $base;
1208 1700
1209 for my $pkg (keys %EXT_MAP) { 1701 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1210 if ($path =~ $EXT_MAP{$pkg}) { 1702 if ($path =~ $EXT_MAP{$pkg}[1]) {
1211 my $self = bless cf::map::new, $pkg; 1703 my $self = bless cf::map::new, $pkg;
1212 $self->{path} = $path; $self->path ($path); 1704 $self->{path} = $path; $self->path ($path);
1213 $self->init; # pass $1 etc. 1705 $self->init; # pass $1 etc.
1214 return $self; 1706 return $self;
1215 } 1707 }
1216 } 1708 }
1217 1709
1218 Carp::carp "unable to resolve path '$path'."; 1710 Carp::cluck "unable to resolve path '$path' (base '$base').";
1219 () 1711 ()
1220} 1712}
1221 1713
1222sub init { 1714sub init {
1223 my ($self) = @_; 1715 my ($self) = @_;
1238 1730
1239# the original (read-only) location 1731# the original (read-only) location
1240sub load_path { 1732sub load_path {
1241 my ($self) = @_; 1733 my ($self) = @_;
1242 1734
1243 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1735 "$MAPDIR/$self->{path}.map"
1244} 1736}
1245 1737
1246# the temporary/swap location 1738# the temporary/swap location
1247sub save_path { 1739sub save_path {
1248 my ($self) = @_; 1740 my ($self) = @_;
1249 1741
1250 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1251 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1743 "$TMPDIR/$path.map"
1252} 1744}
1253 1745
1254# the unique path, undef == no special unique path 1746# the unique path, undef == no special unique path
1255sub uniq_path { 1747sub uniq_path {
1256 my ($self) = @_; 1748 my ($self) = @_;
1257 1749
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1751 "$UNIQUEDIR/$path"
1260} 1752}
1261 1753
1262# and all this just because we cannot iterate over 1754# and all this just because we cannot iterate over
1263# all maps in C++... 1755# all maps in C++...
1264sub change_all_map_light { 1756sub change_all_map_light {
1266 1758
1267 $_->change_map_light ($change) 1759 $_->change_map_light ($change)
1268 for grep $_->outdoor, values %cf::MAP; 1760 for grep $_->outdoor, values %cf::MAP;
1269} 1761}
1270 1762
1763sub decay_objects {
1764 my ($self) = @_;
1765
1766 return if $self->{deny_reset};
1767
1768 $self->do_decay_objects;
1769}
1770
1271sub unlink_save { 1771sub unlink_save {
1272 my ($self) = @_; 1772 my ($self) = @_;
1273 1773
1274 utf8::encode (my $save = $self->save_path); 1774 utf8::encode (my $save = $self->save_path);
1275 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1775 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1278 1778
1279sub load_header_from($) { 1779sub load_header_from($) {
1280 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1281 1781
1282 utf8::encode $path; 1782 utf8::encode $path;
1283 aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1284 or return; 1784 or return;
1285 1785
1286 $self->_load_header ($path) 1786 $self->_load_header ($f)
1287 or return; 1787 or return;
1288 1788
1789 local $MAP_LOADING{$self->{path}} = $self;
1790 $f->resolve_delayed_derefs;
1791
1289 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1290 1793
1291 1 1794 1
1292} 1795}
1293 1796
1294sub load_orig { 1797sub load_header_orig {
1295 my ($self) = @_; 1798 my ($self) = @_;
1296 1799
1297 $self->load_header_from ($self->load_path) 1800 $self->load_header_from ($self->load_path)
1298} 1801}
1299 1802
1300sub load_temp { 1803sub load_header_temp {
1301 my ($self) = @_; 1804 my ($self) = @_;
1302 1805
1303 $self->load_header_from ($self->save_path) 1806 $self->load_header_from ($self->save_path)
1807}
1808
1809sub prepare_temp {
1810 my ($self) = @_;
1811
1812 $self->last_access ((delete $self->{last_access})
1813 || $cf::RUNTIME); #d#
1814 # safety
1815 $self->{instantiate_time} = $cf::RUNTIME
1816 if $self->{instantiate_time} > $cf::RUNTIME;
1817}
1818
1819sub prepare_orig {
1820 my ($self) = @_;
1821
1822 $self->{load_original} = 1;
1823 $self->{instantiate_time} = $cf::RUNTIME;
1824 $self->last_access ($cf::RUNTIME);
1825 $self->instantiate;
1304} 1826}
1305 1827
1306sub load_header { 1828sub load_header {
1307 my ($self) = @_; 1829 my ($self) = @_;
1308 1830
1309 if ($self->load_temp) { 1831 if ($self->load_header_temp) {
1310 $self->last_access ((delete $self->{last_access}) 1832 $self->prepare_temp;
1311 || $cf::RUNTIME); #d#
1312 # safety
1313 $self->{instantiate_time} = $cf::RUNTIME
1314 if $self->{instantiate_time} > $cf::RUNTIME;
1315 } else { 1833 } else {
1316 $self->load_orig 1834 $self->load_header_orig
1317 or return; 1835 or return;
1318 1836 $self->prepare_orig;
1319 $self->{load_original} = 1;
1320 $self->{instantiate_time} = $cf::RUNTIME;
1321 $self->last_access ($cf::RUNTIME);
1322 $self->instantiate;
1323 } 1837 }
1838
1839 $self->{deny_reset} = 1
1840 if $self->no_reset;
1841
1842 $self->default_region (cf::region::find_by_path $self->{path})
1843 unless $self->default_region;
1324 1844
1325 1 1845 1
1326} 1846}
1327 1847
1328sub find; 1848sub find;
1329sub find { 1849sub find {
1330 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1331 1851
1332 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1333 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1334 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1335 1856
1336 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1337 my $guard = cf::lock_acquire "map_find:$path"; 1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1338 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1339 or return; 1862 or return;
1340 1863
1341 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1342 1865
1343 $map->load_header 1866 $map->load_header
1344 or return; 1867 or return;
1345 1868
1346 if ($map->should_reset) { 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1347 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1349 $map->reset; 1874 $map->reset;
1350 undef $guard;
1351 $map = find $path 1875 return find $path;
1352 or return;
1353 } 1876 }
1354 1877
1355 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1356 } 1879 }
1357} 1880}
1881
1882sub pre_load { }
1883sub post_load { }
1358 1884
1359sub load { 1885sub load {
1360 my ($self) = @_; 1886 my ($self) = @_;
1361 1887
1888 local $self->{deny_reset} = 1; # loading can take a long time
1889
1362 my $path = $self->{path}; 1890 my $path = $self->{path};
1891
1892 {
1363 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1364 1894
1895 return unless $self->valid;
1365 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1366 1897
1367 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1368 1899
1369 $self->alloc; 1900 $self->alloc;
1370 $self->_load_objects ($self->{load_path}, 1) 1901
1902 $self->pre_load;
1903 cf::cede_to_tick;
1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1907 $self->_load_objects ($f)
1371 or return; 1908 or return;
1372 1909
1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1374 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1375 1912
1376 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1377 utf8::encode $uniq; 1914 utf8::encode $uniq;
1378 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1379 $self->clear_unique_items; 1917 $self->clear_unique_items;
1380 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1381 } 1921 }
1382 } 1922 }
1383 1923
1384 Coro::cede; 1924 $f->resolve_delayed_derefs;
1385 1925
1926 cf::cede_to_tick;
1386 # now do the right thing for maps 1927 # now do the right thing for maps
1387 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1388
1389 unless ($self->{deny_activate}) {
1390 $self->decay_objects;
1391 $self->fix_auto_apply;
1392 $self->update_buttons;
1393 Coro::cede;
1394 $self->set_darkness_map;
1395 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1396 unless $self->difficulty; 1930 unless $self->difficulty;
1397 Coro::cede; 1931 cf::cede_to_tick;
1932
1933 unless ($self->{deny_activate}) {
1934 $self->decay_objects;
1935 $self->fix_auto_apply;
1936 $self->update_buttons;
1937 cf::cede_to_tick;
1938 $self->set_darkness_map;
1939 cf::cede_to_tick;
1398 $self->activate; 1940 $self->activate;
1399 } 1941 }
1400 1942
1943 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME);
1945
1401 $self->in_memory (cf::MAP_IN_MEMORY); 1946 $self->in_memory (cf::MAP_IN_MEMORY);
1947 }
1948
1949 $self->post_load;
1402} 1950}
1403 1951
1404sub customise_for { 1952sub customise_for {
1405 my ($self, $ob) = @_; 1953 my ($self, $ob) = @_;
1406 1954
1407 return find "~" . $ob->name . "/" . $self->{path} 1955 return find "~" . $ob->name . "/" . $self->{path}
1408 if $self->per_player; 1956 if $self->per_player;
1409 1957
1958# return find "?party/" . $ob->name . "/" . $self->{path}
1959# if $self->per_party;
1960
1410 $self 1961 $self
1411} 1962}
1412 1963
1413# find and load all maps in the 3x3 area around a map 1964# find and load all maps in the 3x3 area around a map
1414sub load_diag { 1965sub load_neighbours {
1415 my ($map) = @_; 1966 my ($map) = @_;
1416 1967
1417 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1418 1969
1419 for (0 .. 3) { 1970 for (0 .. 3) {
1420 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1421 or next; 1972 or next;
1422 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1423 or next; 1974 or next;
1424 $neigh->load; 1975 $neigh->load;
1425 1976
1977 push @neigh,
1426 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1427 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1428 } 1980 }
1429 1981
1430 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1431 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1432 or next; 1985 or next;
1433 $neigh->load; 1986 $neigh->load;
1434 } 1987 }
1435} 1988}
1436 1989
1441} 1994}
1442 1995
1443sub do_load_sync { 1996sub do_load_sync {
1444 my ($map) = @_; 1997 my ($map) = @_;
1445 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1446 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1447} 2003}
1448 2004
1449our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1450our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1451 2007
1452sub find_async { 2008sub find_async {
1453 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1454 2010
1455 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1456 2012
1457 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1459 } 2015 }
1460 2016
1461 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1462 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1463 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1464 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1465 my $map = find $path 2022 if (my $map = find $k) {
1466 or next;
1467 $map->load; 2023 $map->load if $v;
2024 }
1468 2025
1469 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
1470 } 2027 }
1471 } 2028 }
1472 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
1473 }; 2030 };
2031 $MAP_PREFETCHER->prio (6);
1474 2032
1475 () 2033 ()
1476} 2034}
1477 2035
1478sub save { 2036sub save {
1479 my ($self) = @_; 2037 my ($self) = @_;
1480 2038
1481 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
1482 2040
1483 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1484 2042
1485 return unless $self->dirty; 2043 return unless $self->dirty;
1486 2044
1509 my ($self) = @_; 2067 my ($self) = @_;
1510 2068
1511 # save first because save cedes 2069 # save first because save cedes
1512 $self->save; 2070 $self->save;
1513 2071
1514 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
1515 2073
1516 return if $self->players; 2074 return if $self->players;
1517 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
1518 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1519 2077
2078 $self->deactivate;
1520 $self->clear; 2079 $self->clear;
1521 $self->in_memory (cf::MAP_SWAPPED); 2080 $self->in_memory (cf::MAP_SWAPPED);
1522} 2081}
1523 2082
1524sub reset_at { 2083sub reset_at {
1525 my ($self) = @_; 2084 my ($self) = @_;
1526 2085
1527 # TODO: safety, remove and allow resettable per-player maps 2086 # TODO: safety, remove and allow resettable per-player maps
1528 return 1e99 if $self->isa ("ext::map_per_player");#d#
1529 return 1e99 if $self->{deny_reset}; 2087 return 1e99 if $self->{deny_reset};
1530 2088
1531 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2089 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1532 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2090 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1533 2091
1544 my ($self) = @_; 2102 my ($self) = @_;
1545 2103
1546 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2104 my $lock = cf::lock_acquire "map_data:$self->{path}";
1547 2105
1548 return if $self->players; 2106 return if $self->players;
1549 return if $self->isa ("ext::map_per_player");#d#
1550 2107
1551 warn "resetting map ", $self->path;#d# 2108 warn "resetting map ", $self->path;
2109
2110 $self->in_memory (cf::MAP_SWAPPED);
2111
2112 # need to save uniques path
2113 unless ($self->{deny_save}) {
2114 my $uniq = $self->uniq_path; utf8::encode $uniq;
2115
2116 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2117 if $uniq;
2118 }
1552 2119
1553 delete $cf::MAP{$self->path}; 2120 delete $cf::MAP{$self->path};
1554 2121
1555 $self->in_memory (cf::MAP_SWAPPED); 2122 $self->deactivate;
1556 $self->clear; 2123 $self->clear;
1557 2124
1558 $_->clear_links_to ($self) for values %cf::MAP; 2125 $_->clear_links_to ($self) for values %cf::MAP;
1559 2126
1560 $self->unlink_save; 2127 $self->unlink_save;
1564my $nuke_counter = "aaaa"; 2131my $nuke_counter = "aaaa";
1565 2132
1566sub nuke { 2133sub nuke {
1567 my ($self) = @_; 2134 my ($self) = @_;
1568 2135
2136 {
2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138
1569 delete $cf::MAP{$self->path}; 2139 delete $cf::MAP{$self->path};
1570 2140
1571 $self->unlink_save; 2141 $self->unlink_save;
1572 2142
1573 bless $self, "cf::map"; 2143 bless $self, "cf::map";
1574 delete $self->{deny_reset}; 2144 delete $self->{deny_reset};
1575 $self->{deny_save} = 1; 2145 $self->{deny_save} = 1;
1576 $self->reset_timeout (1); 2146 $self->reset_timeout (1);
1577 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2147 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1578 2148
1579 $cf::MAP{$self->path} = $self; 2149 $cf::MAP{$self->path} = $self;
2150 }
1580 2151
1581 $self->reset; # polite request, might not happen 2152 $self->reset; # polite request, might not happen
2153}
2154
2155=item $maps = cf::map::tmp_maps
2156
2157Returns an arrayref with all map paths of currently instantiated and saved
2158maps. May block.
2159
2160=cut
2161
2162sub tmp_maps() {
2163 [
2164 map {
2165 utf8::decode $_;
2166 /\.map$/
2167 ? normalise $_
2168 : ()
2169 } @{ aio_readdir $TMPDIR or [] }
2170 ]
2171}
2172
2173=item $maps = cf::map::random_maps
2174
2175Returns an arrayref with all map paths of currently instantiated and saved
2176random maps. May block.
2177
2178=cut
2179
2180sub random_maps() {
2181 [
2182 map {
2183 utf8::decode $_;
2184 /\.map$/
2185 ? normalise "?random/$_"
2186 : ()
2187 } @{ aio_readdir $RANDOMDIR or [] }
2188 ]
1582} 2189}
1583 2190
1584=item cf::map::unique_maps 2191=item cf::map::unique_maps
1585 2192
1586Returns an arrayref of paths of all shared maps that have 2193Returns an arrayref of paths of all shared maps that have
1587instantiated unique items. May block. 2194instantiated unique items. May block.
1588 2195
1589=cut 2196=cut
1590 2197
1591sub unique_maps() { 2198sub unique_maps() {
1592 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2199 [
1593 or return; 2200 map {
1594
1595 my @paths;
1596
1597 for (@$files) {
1598 utf8::decode $_; 2201 utf8::decode $_;
1599 next if /\.pst$/;
1600 next unless /^$PATH_SEP/o;
1601
1602 s/\.map$//; 2202 /\.map$/
1603 push @paths, $_; 2203 ? normalise $_
2204 : ()
2205 } @{ aio_readdir $UNIQUEDIR or [] }
1604 } 2206 ]
1605
1606 \@paths
1607} 2207}
1608 2208
1609package cf; 2209package cf;
1610 2210
1611=back 2211=back
1629 map { $_, inv_recursive_ $_->inv } @_ 2229 map { $_, inv_recursive_ $_->inv } @_
1630} 2230}
1631 2231
1632sub inv_recursive { 2232sub inv_recursive {
1633 inv_recursive_ inv $_[0] 2233 inv_recursive_ inv $_[0]
2234}
2235
2236=item $ref = $ob->ref
2237
2238creates and returns a persistent reference to an objetc that can be stored as a string.
2239
2240=item $ob = cf::object::deref ($refstring)
2241
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block.
2244
2245=cut
2246
2247sub deref {
2248 my ($ref) = @_;
2249
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return;
2257 $pl->ob->uuid eq $uuid
2258 or return;
2259
2260 $pl->ob
2261 } else {
2262 warn "$ref: cannot resolve object reference\n";
2263 undef
2264 }
1634} 2265}
1635 2266
1636package cf; 2267package cf;
1637 2268
1638=back 2269=back
1657 2288
1658 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2289 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1659 2290
1660 if ($self->{record_replies}) { 2291 if ($self->{record_replies}) {
1661 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2292 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2293
1662 } else { 2294 } else {
2295 my $pl = $self->contr;
2296
2297 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2298 my $dialog = $pl->{npc_dialog};
2299 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2300
2301 } else {
1663 $msg = $npc->name . " says: $msg" if $npc; 2302 $msg = $npc->name . " says: $msg" if $npc;
1664 $self->message ($msg, $flags); 2303 $self->message ($msg, $flags);
2304 }
1665 } 2305 }
2306}
2307
2308=item $object->send_msg ($channel, $msg, $color, [extra...])
2309
2310=cut
2311
2312sub cf::object::send_msg {
2313 my $pl = shift->contr
2314 or return;
2315 $pl->send_msg (@_);
1666} 2316}
1667 2317
1668=item $player_object->may ("access") 2318=item $player_object->may ("access")
1669 2319
1670Returns wether the given player is authorized to access resource "access" 2320Returns wether the given player is authorized to access resource "access"
1702=cut 2352=cut
1703 2353
1704sub link_map { 2354sub link_map {
1705 unless ($LINK_MAP) { 2355 unless ($LINK_MAP) {
1706 $LINK_MAP = cf::map::find "{link}" 2356 $LINK_MAP = cf::map::find "{link}"
1707 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2357 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1708 $LINK_MAP->load; 2358 $LINK_MAP->load;
1709 } 2359 }
1710 2360
1711 $LINK_MAP 2361 $LINK_MAP
1712} 2362}
1717 $self->deactivate_recursive; 2367 $self->deactivate_recursive;
1718 2368
1719 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2369 return if UNIVERSAL::isa $self->map, "ext::map_link";
1720 2370
1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2371 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1722 if $self->map; 2372 if $self->map && $self->map->{path} ne "{link}";
1723 2373
1724 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2374 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1725} 2375}
1726 2376
1727sub cf::object::player::leave_link { 2377sub cf::object::player::leave_link {
1728 my ($self, $map, $x, $y) = @_; 2378 my ($self, $map, $x, $y) = @_;
2379
2380 return unless $self->contr->active;
1729 2381
1730 my $link_pos = delete $self->{_link_pos}; 2382 my $link_pos = delete $self->{_link_pos};
1731 2383
1732 unless ($map) { 2384 unless ($map) {
1733 # restore original map position 2385 # restore original map position
1747 # use -1 or undef as default coordinates, not 0, 0 2399 # use -1 or undef as default coordinates, not 0, 0
1748 ($x, $y) = ($map->enter_x, $map->enter_y) 2400 ($x, $y) = ($map->enter_x, $map->enter_y)
1749 if $x <=0 && $y <= 0; 2401 if $x <=0 && $y <= 0;
1750 2402
1751 $map->load; 2403 $map->load;
1752 $map->load_diag; 2404 $map->load_neighbours;
1753 2405
1754 return unless $self->contr->active; 2406 return unless $self->contr->active;
1755 $self->activate_recursive; 2407 $self->activate_recursive;
2408
2409 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1756 $self->enter_map ($map, $x, $y); 2410 $self->enter_map ($map, $x, $y);
1757} 2411}
1758 2412
1759cf::player->attach ( 2413=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1760 on_logout => sub {
1761 my ($pl) = @_;
1762 2414
1763 # abort map switching before logout 2415Moves the player to the given map-path and coordinates by first freezing
1764 if ($pl->ob->{_link_pos}) { 2416her, loading and preparing them map, calling the provided $check callback
1765 cf::sync_job { 2417that has to return the map if sucecssful, and then unfreezes the player on
1766 $pl->ob->leave_link 2418the new (success) or old (failed) map position. In either case, $done will
1767 }; 2419be called at the end of this process.
1768 }
1769 },
1770 on_login => sub {
1771 my ($pl) = @_;
1772 2420
1773 # try to abort aborted map switching on player login :)
1774 # should happen only on crashes
1775 if ($pl->ob->{_link_pos}) {
1776 $pl->ob->enter_link;
1777 (async {
1778 # we need this sleep as the login has a concurrent enter_exit running
1779 # and this sleep increases chances of the player not ending up in scorn
1780 $pl->ob->reply (undef,
1781 "There was an internal problem at your last logout, "
1782 . "the server will try to bring you to your intended destination in a second.",
1783 cf::NDI_RED);
1784 Coro::Timer::sleep 1;
1785 $pl->ob->leave_link;
1786 })->prio (2);
1787 }
1788 },
1789);
1790
1791=item $player_object->goto ($path, $x, $y)
1792
1793=cut 2421=cut
2422
2423our $GOTOGEN;
1794 2424
1795sub cf::object::player::goto { 2425sub cf::object::player::goto {
1796 my ($self, $path, $x, $y) = @_; 2426 my ($self, $path, $x, $y, $check, $done) = @_;
2427
2428 # do generation counting so two concurrent goto's will be executed in-order
2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1797 2430
1798 $self->enter_link; 2431 $self->enter_link;
1799 2432
1800 (async { 2433 (async {
2434 my $map = eval {
1801 my $map = cf::map::find $path; 2435 my $map = cf::map::find $path;
2436
2437 if ($map) {
1802 $map = $map->customise_for ($self) if $map; 2438 $map = $map->customise_for ($self);
1803 2439 $map = $check->($map) if $check && $map;
1804# warn "entering ", $map->path, " at ($x, $y)\n" 2440 } else {
1805# if $map;
1806
1807 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2441 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2442 }
1808 2443
2444 $map
2445 };
2446
2447 if ($@) {
2448 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2449 LOG llevError | logBacktrace, Carp::longmess $@;
2450 }
2451
2452 if ($gen == $self->{_goto_generation}) {
2453 delete $self->{_goto_generation};
1809 $self->leave_link ($map, $x, $y); 2454 $self->leave_link ($map, $x, $y);
2455 }
2456
2457 $done->() if $done;
1810 })->prio (1); 2458 })->prio (1);
1811} 2459}
1812 2460
1813=item $player_object->enter_exit ($exit_object) 2461=item $player_object->enter_exit ($exit_object)
1814 2462
1843 # that depends on the exit object 2491 # that depends on the exit object
1844 2492
1845 my $rmp = parse_random_map_params $exit->msg; 2493 my $rmp = parse_random_map_params $exit->msg;
1846 2494
1847 if ($exit->map) { 2495 if ($exit->map) {
1848 $rmp->{region} = $exit->map->region_name; 2496 $rmp->{region} = $exit->region->name;
1849 $rmp->{origin_map} = $exit->map->path; 2497 $rmp->{origin_map} = $exit->map->path;
1850 $rmp->{origin_x} = $exit->x; 2498 $rmp->{origin_x} = $exit->x;
1851 $rmp->{origin_y} = $exit->y; 2499 $rmp->{origin_y} = $exit->y;
1852 } 2500 }
1853 2501
1854 $rmp->{random_seed} ||= $exit->random_seed; 2502 $rmp->{random_seed} ||= $exit->random_seed;
1855 2503
1856 my $data = cf::to_json $rmp; 2504 my $data = cf::to_json $rmp;
1857 my $md5 = Digest::MD5::md5_hex $data; 2505 my $md5 = Digest::MD5::md5_hex $data;
1858 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2506 my $meta = "$RANDOMDIR/$md5.meta";
1859 2507
1860 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2508 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1861 aio_write $fh, 0, (length $data), $data, 0; 2509 aio_write $fh, 0, (length $data), $data, 0;
1862 undef $fh; 2510 undef $fh;
1863 aio_rename "$meta~", $meta; 2511 aio_rename "$meta~", $meta;
1870sub cf::object::player::enter_exit { 2518sub cf::object::player::enter_exit {
1871 my ($self, $exit) = @_; 2519 my ($self, $exit) = @_;
1872 2520
1873 return unless $self->type == cf::PLAYER; 2521 return unless $self->type == cf::PLAYER;
1874 2522
2523 if ($exit->slaying eq "/!") {
2524 #TODO: this should de-fi-ni-te-ly not be a sync-job
2525 # the problem is that $exit might not survive long enough
2526 # so it needs to be done right now, right here
2527 cf::sync_job { prepare_random_map $exit };
2528 }
2529
2530 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2531 my $hp = $exit->stats->hp;
2532 my $sp = $exit->stats->sp;
2533
1875 $self->enter_link; 2534 $self->enter_link;
2535
2536 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED);
1876 2539
1877 (async { 2540 (async {
1878 $self->deactivate_recursive; # just to be sure 2541 $self->deactivate_recursive; # just to be sure
1879 unless (eval { 2542 unless (eval {
1880 prepare_random_map $exit 2543 $self->goto ($slaying, $hp, $sp);
1881 if $exit->slaying eq "/!";
1882
1883 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1884 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1885 2544
1886 1; 2545 1;
1887 }) { 2546 }) {
1888 $self->message ("Something went wrong deep within the crossfire server. " 2547 $self->message ("Something went wrong deep within the crossfire server. "
1889 . "I'll try to bring you back to the map you were before. " 2548 . "I'll try to bring you back to the map you were before. "
1890 . "Please report this to the dungeon master!", 2549 . "Please report this to the dungeon master!",
1891 cf::NDI_UNIQUE | cf::NDI_RED); 2550 cf::NDI_UNIQUE | cf::NDI_RED);
1892 2551
1893 warn "ERROR in enter_exit: $@"; 2552 warn "ERROR in enter_exit: $@";
1894 $self->leave_link; 2553 $self->leave_link;
1895 } 2554 }
1896 })->prio (1); 2555 })->prio (1);
1909 2568
1910sub cf::client::send_drawinfo { 2569sub cf::client::send_drawinfo {
1911 my ($self, $text, $flags) = @_; 2570 my ($self, $text, $flags) = @_;
1912 2571
1913 utf8::encode $text; 2572 utf8::encode $text;
1914 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2573 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1915} 2574}
1916 2575
2576=item $client->send_msg ($channel, $msg, $color, [extra...])
2577
2578Send a drawinfo or msg packet to the client, formatting the msg for the
2579client if neccessary. C<$type> should be a string identifying the type of
2580the message, with C<log> being the default. If C<$color> is negative, suppress
2581the message unless the client supports the msg packet.
2582
2583=cut
2584
2585our %CHANNEL = (
2586 "c/identify" => {
2587 id => "identify",
2588 title => "Identify",
2589 reply => undef,
2590 tooltip => "Items recently identified",
2591 },
2592 "c/examine" => {
2593 id => "examine",
2594 title => "Examine",
2595 reply => undef,
2596 tooltip => "Signs and other items you examined",
2597 },
2598);
2599
2600sub cf::client::send_msg {
2601 my ($self, $channel, $msg, $color, @extra) = @_;
2602
2603 $msg = $self->pl->expand_cfpod ($msg);
2604
2605 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606
2607 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2609
2610 if (ref $channel) {
2611 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg;
2616 }
2617
2618 $channel = $channel->{id};
2619 }
2620
2621 return unless @extra || length $msg;
2622
2623 if ($self->can_msg) {
2624 # default colour, mask it out
2625 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2626 if $color & cf::NDI_DEF;
2627
2628 $self->send_packet ("msg " . $self->{json_coder}->encode (
2629 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2630 } else {
2631 if ($color >= 0) {
2632 # replace some tags by gcfclient-compatible ones
2633 for ($msg) {
2634 1 while
2635 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2636 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2637 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2638 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2639 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2640 }
2641
2642 $color &= cf::NDI_COLOR_MASK;
2643
2644 utf8::encode $msg;
2645
2646 if (0 && $msg =~ /\[/) {
2647 # COMMAND/INFO
2648 $self->send_packet ("drawextinfo $color 10 8 $msg")
2649 } else {
2650 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2651 $self->send_packet ("drawinfo $color $msg")
2652 }
2653 }
2654 }
2655}
2656
2657=item $client->ext_msg ($type, @msg)
2658
2659Sends an ext event to the client.
2660
2661=cut
2662
2663sub cf::client::ext_msg($$@) {
2664 my ($self, $type, @msg) = @_;
2665
2666 if ($self->extcmd == 2) {
2667 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2668 } elsif ($self->extcmd == 1) { # TODO: remove
2669 push @msg, msgtype => "event_$type";
2670 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2671 }
2672}
2673
2674=item $client->ext_reply ($msgid, @msg)
2675
2676Sends an ext reply to the client.
2677
2678=cut
2679
2680sub cf::client::ext_reply($$@) {
2681 my ($self, $id, @msg) = @_;
2682
2683 if ($self->extcmd == 2) {
2684 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2685 } elsif ($self->extcmd == 1) {
2686 #TODO: version 1, remove
2687 unshift @msg, msgtype => "reply", msgid => $id;
2688 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2689 }
2690}
1917 2691
1918=item $success = $client->query ($flags, "text", \&cb) 2692=item $success = $client->query ($flags, "text", \&cb)
1919 2693
1920Queues a query to the client, calling the given callback with 2694Queues a query to the client, calling the given callback with
1921the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2695the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1922C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2696C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1923 2697
1924Queries can fail, so check the return code. Or don't, as queries will become 2698Queries can fail, so check the return code. Or don't, as queries will
1925reliable at some point in the future. 2699become reliable at some point in the future.
1926 2700
1927=cut 2701=cut
1928 2702
1929sub cf::client::query { 2703sub cf::client::query {
1930 my ($self, $flags, $text, $cb) = @_; 2704 my ($self, $flags, $text, $cb) = @_;
1938 utf8::encode $text; 2712 utf8::encode $text;
1939 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2713 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1940 2714
1941 $self->send_packet ($self->{query_queue}[0][0]) 2715 $self->send_packet ($self->{query_queue}[0][0])
1942 if @{ $self->{query_queue} } == 1; 2716 if @{ $self->{query_queue} } == 1;
2717
2718 1
1943} 2719}
1944 2720
1945cf::client->attach ( 2721cf::client->attach (
2722 on_connect => sub {
2723 my ($ns) = @_;
2724
2725 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2726 },
1946 on_reply => sub { 2727 on_reply => sub {
1947 my ($ns, $msg) = @_; 2728 my ($ns, $msg) = @_;
1948 2729
1949 # this weird shuffling is so that direct followup queries 2730 # this weird shuffling is so that direct followup queries
1950 # get handled first 2731 # get handled first
1951 my $queue = delete $ns->{query_queue} 2732 my $queue = delete $ns->{query_queue}
1952 or return; # be conservative, not sure how that can happen, but we saw a crash here 2733 or return; # be conservative, not sure how that can happen, but we saw a crash here
1953 2734
1954 (shift @$queue)->[1]->($msg); 2735 (shift @$queue)->[1]->($msg);
2736 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1955 2737
1956 push @{ $ns->{query_queue} }, @$queue; 2738 push @{ $ns->{query_queue} }, @$queue;
1957 2739
1958 if (@{ $ns->{query_queue} } == @$queue) { 2740 if (@{ $ns->{query_queue} } == @$queue) {
1959 if (@$queue) { 2741 if (@$queue) {
1961 } else { 2743 } else {
1962 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2744 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1963 } 2745 }
1964 } 2746 }
1965 }, 2747 },
2748 on_exticmd => sub {
2749 my ($ns, $buf) = @_;
2750
2751 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2752
2753 if (ref $msg) {
2754 my ($type, $reply, @payload) =
2755 "ARRAY" eq ref $msg
2756 ? @$msg
2757 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2758
2759 my @reply;
2760
2761 if (my $cb = $EXTICMD{$type}) {
2762 @reply = $cb->($ns, @payload);
2763 }
2764
2765 $ns->ext_reply ($reply, @reply)
2766 if $reply;
2767
2768 } else {
2769 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2770 }
2771
2772 cf::override;
2773 },
1966); 2774);
1967 2775
1968=item $client->async (\&cb) 2776=item $client->async (\&cb)
1969 2777
1970Create a new coroutine, running the specified callback. The coroutine will 2778Create a new coroutine, running the specified callback. The coroutine will
2011our $safe = new Safe "safe"; 2819our $safe = new Safe "safe";
2012our $safe_hole = new Safe::Hole; 2820our $safe_hole = new Safe::Hole;
2013 2821
2014$SIG{FPE} = 'IGNORE'; 2822$SIG{FPE} = 'IGNORE';
2015 2823
2016$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2824$safe->permit_only (Opcode::opset qw(
2825 :base_core :base_mem :base_orig :base_math
2826 grepstart grepwhile mapstart mapwhile
2827 sort time
2828));
2017 2829
2018# here we export the classes and methods available to script code 2830# here we export the classes and methods available to script code
2019 2831
2020=pod 2832=pod
2021 2833
2022The following fucntions and emthods are available within a safe environment: 2834The following functions and methods are available within a safe environment:
2023 2835
2024 cf::object contr pay_amount pay_player map 2836 cf::object
2837 contr pay_amount pay_player map x y force_find force_add
2838 insert remove name archname title slaying race decrease_ob_nr
2839
2025 cf::object::player player 2840 cf::object::player
2026 cf::player peaceful 2841 player
2027 cf::map trigger 2842
2843 cf::player
2844 peaceful
2845
2846 cf::map
2847 trigger
2028 2848
2029=cut 2849=cut
2030 2850
2031for ( 2851for (
2032 ["cf::object" => qw(contr pay_amount pay_player map)], 2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race
2854 decrease_ob_nr)],
2033 ["cf::object::player" => qw(player)], 2855 ["cf::object::player" => qw(player)],
2034 ["cf::player" => qw(peaceful)], 2856 ["cf::player" => qw(peaceful)],
2035 ["cf::map" => qw(trigger)], 2857 ["cf::map" => qw(trigger)],
2036) { 2858) {
2037 no strict 'refs'; 2859 no strict 'refs';
2108=back 2930=back
2109 2931
2110=cut 2932=cut
2111 2933
2112############################################################################# 2934#############################################################################
2935# the server's init and main functions
2113 2936
2114=head2 EXTENSION DATABASE SUPPORT 2937sub load_facedata($) {
2938 my ($path) = @_;
2115 2939
2116Crossfire maintains a very simple database for extension use. It can 2940 # HACK to clear player env face cache, we need some signal framework
2117currently store anything that can be serialised using Storable, which 2941 # for this (global event?)
2118excludes objects. 2942 %ext::player_env::MUSIC_FACE_CACHE = ();
2119 2943
2120The parameter C<$family> should best start with the name of the extension 2944 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2121using it, it should be unique.
2122 2945
2123=over 4 2946 warn "loading facedata from $path\n";
2124 2947
2125=item $hashref = cf::db_get $family 2948 my $facedata;
2949 0 < aio_load $path, $facedata
2950 or die "$path: $!";
2126 2951
2127Return a hashref for use by the extension C<$family>, which can be 2952 $facedata = Coro::Storable::thaw $facedata;
2128modified. After modifications, you have to call C<cf::db_dirty> or
2129C<cf::db_sync>.
2130 2953
2131=item $value = cf::db_get $family => $key 2954 $facedata->{version} == 2
2955 or cf::cleanup "$path: version mismatch, cannot proceed.";
2132 2956
2133Returns a single value from the database 2957 # patch in the exptable
2134 2958 $facedata->{resource}{"res/exp_table"} = {
2135=item cf::db_put $family => $hashref 2959 type => FT_RSRC,
2136 2960 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2137Stores the given family hashref into the database. Updates are delayed, if
2138you want the data to be synced to disk immediately, use C<cf::db_sync>.
2139
2140=item cf::db_put $family => $key => $value
2141
2142Stores the given C<$value> in the family hash. Updates are delayed, if you
2143want the data to be synced to disk immediately, use C<cf::db_sync>.
2144
2145=item cf::db_dirty
2146
2147Marks the database as dirty, to be updated at a later time.
2148
2149=item cf::db_sync
2150
2151Immediately write the database to disk I<if it is dirty>.
2152
2153=cut
2154
2155our $DB;
2156
2157{
2158 my $path = cf::localdir . "/database.pst";
2159
2160 sub db_load() {
2161 $DB = stat $path ? Storable::retrieve $path : { };
2162 }
2163
2164 my $pid;
2165
2166 sub db_save() {
2167 waitpid $pid, 0 if $pid;
2168 if (0 == ($pid = fork)) {
2169 $DB->{_meta}{version} = 1;
2170 Storable::nstore $DB, "$path~";
2171 rename "$path~", $path;
2172 cf::_exit 0 if defined $pid;
2173 }
2174 }
2175
2176 my $dirty;
2177
2178 sub db_sync() {
2179 db_save if $dirty;
2180 undef $dirty;
2181 }
2182
2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2184 db_sync;
2185 }); 2961 };
2962 cf::cede_to_tick;
2186 2963
2187 sub db_dirty() {
2188 $dirty = 1;
2189 $idle->start;
2190 } 2964 {
2965 my $faces = $facedata->{faceinfo};
2191 2966
2192 sub db_get($;$) { 2967 while (my ($face, $info) = each %$faces) {
2193 @_ >= 2 2968 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2194 ? $DB->{$_[0]}{$_[1]} 2969 cf::face::set_visibility $idx, $info->{visibility};
2195 : ($DB->{$_[0]} ||= { }) 2970 cf::face::set_magicmap $idx, $info->{magicmap};
2196 } 2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2197 2973
2198 sub db_put($$;$) { 2974 cf::cede_to_tick;
2199 if (@_ >= 3) {
2200 $DB->{$_[0]}{$_[1]} = $_[2];
2201 } else {
2202 $DB->{$_[0]} = $_[1];
2203 }
2204 db_dirty;
2205 }
2206
2207 cf::global->attach (
2208 prio => 10000,
2209 on_cleanup => sub {
2210 db_sync;
2211 }, 2975 }
2212 );
2213}
2214 2976
2215############################################################################# 2977 while (my ($face, $info) = each %$faces) {
2216# the server's main() 2978 next unless $info->{smooth};
2979 my $idx = cf::face::find $face
2980 or next;
2981 if (my $smooth = cf::face::find $info->{smooth}) {
2982 cf::face::set_smooth $idx, $smooth;
2983 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2984 } else {
2985 warn "smooth face '$info->{smooth}' not found for face '$face'";
2986 }
2217 2987
2218sub cfg_load { 2988 cf::cede_to_tick;
2989 }
2990 }
2991
2992 {
2993 my $anims = $facedata->{animinfo};
2994
2995 while (my ($anim, $info) = each %$anims) {
2996 cf::anim::set $anim, $info->{frames}, $info->{facings};
2997 cf::cede_to_tick;
2998 }
2999
3000 cf::anim::invalidate_all; # d'oh
3001 }
3002
3003 {
3004 # TODO: for gcfclient pleasure, we should give resources
3005 # that gcfclient doesn't grok a >10000 face index.
3006 my $res = $facedata->{resource};
3007
3008 my $soundconf = delete $res->{"res/sound.conf"};
3009
3010 while (my ($name, $info) = each %$res) {
3011 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data;
3013
3014 if ($info->{type} & 1) {
3015 # prepend meta info
3016
3017 my $meta = $enc->encode ({
3018 name => $name,
3019 %{ $info->{meta} || {} },
3020 });
3021
3022 $data = pack "(w/a*)*", $meta, $info->{data};
3023 } else {
3024 $data = $info->{data};
3025 }
3026
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
3030 cf::cede_to_tick;
3031 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
3050 }
3051
3052 1
3053}
3054
3055register_exticmd fx_want => sub {
3056 my ($ns, $want) = @_;
3057
3058 while (my ($k, $v) = each %$want) {
3059 $ns->fx_want ($k, $v);
3060 }
3061};
3062
3063sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = ();
3067
3068 load_resource_file "$MAPDIR/regions"
3069 or die "unable to load regions file\n";
3070
3071 for (cf::region::list) {
3072 $_->{match} = qr/$_->{match}/
3073 if exists $_->{match};
3074 }
3075}
3076
3077sub reload_facedata {
3078 load_facedata "$DATADIR/facedata"
3079 or die "unable to load facedata\n";
3080}
3081
3082sub reload_archetypes {
3083 load_resource_file "$DATADIR/archetypes"
3084 or die "unable to load archetypes\n";
3085 #d# NEED to laod twice to resolve forward references
3086 # this really needs to be done in an extra post-pass
3087 # (which needs to be synchronous, so solve it differently)
3088 load_resource_file "$DATADIR/archetypes"
3089 or die "unable to load archetypes\n";
3090}
3091
3092sub reload_treasures {
3093 load_resource_file "$DATADIR/treasures"
3094 or die "unable to load treasurelists\n";
3095}
3096
3097sub reload_resources {
3098 warn "reloading resource files...\n";
3099
3100 reload_regions;
3101 reload_facedata;
3102 #reload_archetypes;#d#
3103 reload_archetypes;
3104 reload_treasures;
3105
3106 warn "finished reloading resource files\n";
3107}
3108
3109sub init {
3110 reload_resources;
3111}
3112
3113sub reload_config {
2219 open my $fh, "<:utf8", cf::confdir . "/config" 3114 open my $fh, "<:utf8", "$CONFDIR/config"
2220 or return; 3115 or return;
2221 3116
2222 local $/; 3117 local $/;
2223 *CFG = YAML::Syck::Load <$fh>; 3118 *CFG = YAML::Syck::Load <$fh>;
2224 3119
2243 (async { 3138 (async {
2244 Event::one_event; 3139 Event::one_event;
2245 })->prio (Coro::PRIO_MAX); 3140 })->prio (Coro::PRIO_MAX);
2246 }; 3141 };
2247 3142
2248 cfg_load; 3143 reload_config;
2249 db_load; 3144 db_init;
2250 load_extensions; 3145 load_extensions;
2251 3146
2252 $TICK_WATCHER->start; 3147 $TICK_WATCHER->start;
2253 Event::loop; 3148 Event::loop;
2254} 3149}
2258 3153
2259# install some emergency cleanup handlers 3154# install some emergency cleanup handlers
2260BEGIN { 3155BEGIN {
2261 for my $signal (qw(INT HUP TERM)) { 3156 for my $signal (qw(INT HUP TERM)) {
2262 Event->signal ( 3157 Event->signal (
3158 reentrant => 0,
2263 data => WF_AUTOCANCEL, 3159 data => WF_AUTOCANCEL,
2264 signal => $signal, 3160 signal => $signal,
3161 prio => 0,
2265 cb => sub { 3162 cb => sub {
2266 cf::cleanup "SIG$signal"; 3163 cf::cleanup "SIG$signal";
2267 }, 3164 },
2268 ); 3165 );
2269 } 3166 }
3167}
3168
3169sub write_runtime {
3170 my $runtime = "$LOCALDIR/runtime";
3171
3172 # first touch the runtime file to show we are still running:
3173 # the fsync below can take a very very long time.
3174
3175 IO::AIO::aio_utime $runtime, undef, undef;
3176
3177 my $guard = cf::lock_acquire "write_runtime";
3178
3179 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3180 or return;
3181
3182 my $value = $cf::RUNTIME + 90 + 10;
3183 # 10 is the runtime save interval, for a monotonic clock
3184 # 60 allows for the watchdog to kill the server.
3185
3186 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3187 and return;
3188
3189 # always fsync - this file is important
3190 aio_fsync $fh
3191 and return;
3192
3193 # touch it again to show we are up-to-date
3194 aio_utime $fh, undef, undef;
3195
3196 close $fh
3197 or return;
3198
3199 aio_rename "$runtime~", $runtime
3200 and return;
3201
3202 warn "runtime file written.\n";
3203
3204 1
2270} 3205}
2271 3206
2272sub emergency_save() { 3207sub emergency_save() {
2273 my $freeze_guard = cf::freeze_mainloop; 3208 my $freeze_guard = cf::freeze_mainloop;
2274 3209
2291 my $map = $cf::MAP{$path} or next; 3226 my $map = $cf::MAP{$path} or next;
2292 $map->valid or next; 3227 $map->valid or next;
2293 $map->save; 3228 $map->save;
2294 } 3229 }
2295 warn "end emergency map save\n"; 3230 warn "end emergency map save\n";
3231
3232 warn "begin emergency database checkpoint\n";
3233 BDB::db_env_txn_checkpoint $DB_ENV;
3234 warn "end emergency database checkpoint\n";
2296 }; 3235 };
2297 3236
2298 warn "leave emergency perl save\n"; 3237 warn "leave emergency perl save\n";
2299} 3238}
2300 3239
3240sub post_cleanup {
3241 my ($make_core) = @_;
3242
3243 warn Carp::longmess "post_cleanup backtrace"
3244 if $make_core;
3245}
3246
2301sub reload() { 3247sub do_reload_perl() {
2302 # can/must only be called in main 3248 # can/must only be called in main
2303 if ($Coro::current != $Coro::main) { 3249 if ($Coro::current != $Coro::main) {
2304 warn "can only reload from main coroutine"; 3250 warn "can only reload from main coroutine";
2305 return; 3251 return;
2306 } 3252 }
2307 3253
2308 warn "reloading..."; 3254 warn "reloading...";
2309 3255
2310 warn "cancelling server ticker"; 3256 warn "entering sync_job";
2311 $TICK_WATCHER->cancel;
2312 3257
3258 cf::sync_job {
3259 cf::write_runtime; # external watchdog should not bark
2313 cf::emergency_save; 3260 cf::emergency_save;
3261 cf::write_runtime; # external watchdog should not bark
2314 3262
2315 eval { 3263 warn "syncing database to disk";
3264 BDB::db_env_txn_checkpoint $DB_ENV;
3265
2316 # if anything goes wrong in here, we should simply crash as we already saved 3266 # if anything goes wrong in here, we should simply crash as we already saved
2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320 3267
2321 warn "cancelling all WF_AUTOCANCEL watchers"; 3268 warn "cancelling all WF_AUTOCANCEL watchers";
2322 for (Event::all_watchers) { 3269 for (Event::all_watchers) {
2323 $_->cancel if $_->data & WF_AUTOCANCEL; 3270 $_->cancel if $_->data & WF_AUTOCANCEL;
2324 } 3271 }
2325 3272
2326 warn "flushing outstanding aio requests"; 3273 warn "flushing outstanding aio requests";
2327 for (;;) { 3274 for (;;) {
3275 BDB::flush;
2328 IO::AIO::flush; 3276 IO::AIO::flush;
2329 Coro::cede; 3277 Coro::cede;
2330 last unless IO::AIO::nreqs; 3278 last unless IO::AIO::nreqs || BDB::nreqs;
2331 warn "iterate..."; 3279 warn "iterate...";
2332 } 3280 }
3281
3282 ++$RELOAD;
2333 3283
2334 warn "cancelling all extension coros"; 3284 warn "cancelling all extension coros";
2335 $_->cancel for values %EXT_CORO; 3285 $_->cancel for values %EXT_CORO;
2336 %EXT_CORO = (); 3286 %EXT_CORO = ();
2337 3287
2338 warn "removing commands"; 3288 warn "removing commands";
2339 %COMMAND = (); 3289 %COMMAND = ();
2340 3290
2341 warn "removing ext commands"; 3291 warn "removing ext/exti commands";
2342 %EXTCMD = (); 3292 %EXTCMD = ();
3293 %EXTICMD = ();
2343 3294
2344 warn "unloading/nuking all extensions"; 3295 warn "unloading/nuking all extensions";
2345 for my $pkg (@EXTS) { 3296 for my $pkg (@EXTS) {
2346 warn "... unloading $pkg"; 3297 warn "... unloading $pkg";
2347 3298
2377 Symbol::delete_package "safe::$_" 3328 Symbol::delete_package "safe::$_"
2378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3329 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2379 3330
2380 warn "unloading cf.pm \"a bit\""; 3331 warn "unloading cf.pm \"a bit\"";
2381 delete $INC{"cf.pm"}; 3332 delete $INC{"cf.pm"};
3333 delete $INC{"cf/pod.pm"};
2382 3334
2383 # don't, removes xs symbols, too, 3335 # don't, removes xs symbols, too,
2384 # and global variables created in xs 3336 # and global variables created in xs
2385 #Symbol::delete_package __PACKAGE__; 3337 #Symbol::delete_package __PACKAGE__;
2386 3338
2389 warn "reloading cf.pm"; 3341 warn "reloading cf.pm";
2390 require cf; 3342 require cf;
2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2392 3344
2393 warn "loading config and database again"; 3345 warn "loading config and database again";
2394 cf::cfg_load; 3346 cf::reload_config;
2395 cf::db_load;
2396 3347
2397 warn "loading extensions"; 3348 warn "loading extensions";
2398 cf::load_extensions; 3349 cf::load_extensions;
2399 3350
2400 warn "reattaching attachments to objects/players"; 3351 warn "reattaching attachments to objects/players";
2401 _global_reattach; 3352 _global_reattach; # objects, sockets
2402 warn "reattaching attachments to maps"; 3353 warn "reattaching attachments to maps";
2403 reattach $_ for values %MAP; 3354 reattach $_ for values %MAP;
3355 warn "reattaching attachments to players";
3356 reattach $_ for values %PLAYER;
2404 3357
2405 warn "restarting server ticker"; 3358 warn "leaving sync_job";
2406 3359
2407 $TICK_WATCHER->start; 3360 1
2408 }; 3361 } or do {
2409
2410 if ($@) {
2411 warn $@; 3362 warn $@;
2412 warn "error while reloading, exiting."; 3363 warn "error while reloading, exiting.";
2413 exit 1; 3364 exit 1;
2414 } 3365 };
2415 3366
2416 warn "reloaded"; 3367 warn "reloaded";
2417}; 3368};
2418 3369
2419our $RELOAD_WATCHER; # used only during reload 3370our $RELOAD_WATCHER; # used only during reload
2420 3371
3372sub reload_perl() {
3373 # doing reload synchronously and two reloads happen back-to-back,
3374 # coro crashes during coro_state_free->destroy here.
3375
3376 $RELOAD_WATCHER ||= Event->timer (
3377 reentrant => 0,
3378 after => 0,
3379 data => WF_AUTOCANCEL,
3380 cb => sub {
3381 do_reload_perl;
3382 undef $RELOAD_WATCHER;
3383 },
3384 );
3385}
3386
2421register_command "reload" => sub { 3387register_command "reload" => sub {
2422 my ($who, $arg) = @_; 3388 my ($who, $arg) = @_;
2423 3389
2424 if ($who->flag (FLAG_WIZ)) { 3390 if ($who->flag (FLAG_WIZ)) {
2425 $who->message ("reloading server."); 3391 $who->message ("reloading server.");
2426 3392 async { reload_perl };
2427 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here.
2429
2430 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2431 reload;
2432 undef $RELOAD_WATCHER;
2433 });
2434 } 3393 }
2435}; 3394};
2436 3395
2437unshift @INC, $LIBDIR; 3396unshift @INC, $LIBDIR;
2438 3397
2439my $bug_warning = 0; 3398my $bug_warning = 0;
2440 3399
3400our @WAIT_FOR_TICK;
3401our @WAIT_FOR_TICK_BEGIN;
3402
3403sub wait_for_tick {
3404 return unless $TICK_WATCHER->is_active;
3405 return if $Coro::current == $Coro::main;
3406
3407 my $signal = new Coro::Signal;
3408 push @WAIT_FOR_TICK, $signal;
3409 $signal->wait;
3410}
3411
3412sub wait_for_tick_begin {
3413 return unless $TICK_WATCHER->is_active;
3414 return if $Coro::current == $Coro::main;
3415
3416 my $signal = new Coro::Signal;
3417 push @WAIT_FOR_TICK_BEGIN, $signal;
3418 $signal->wait;
3419}
3420
3421 my $min = 1e6;#d#
3422 my $avg = 10;
2441$TICK_WATCHER = Event->timer ( 3423$TICK_WATCHER = Event->timer (
2442 reentrant => 0, 3424 reentrant => 0,
2443 parked => 1, 3425 parked => 1,
2444 prio => 0, 3426 prio => 0,
2445 at => $NEXT_TICK || $TICK, 3427 at => $NEXT_TICK || $TICK,
2449 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3431 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2450 unless ++$bug_warning > 10; 3432 unless ++$bug_warning > 10;
2451 return; 3433 return;
2452 } 3434 }
2453 3435
2454 $NOW = Event::time; 3436 $NOW = $tick_start = Event::time;
2455 3437
2456 cf::server_tick; # one server iteration 3438 cf::server_tick; # one server iteration
3439
3440 0 && sync_job {#d#
3441 for(1..10) {
3442 my $t = Event::time;
3443 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3444 or die;
3445
3446 $map->width (50);
3447 $map->height (50);
3448 $map->alloc;
3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3450 my $t = Event::time - $t;
3451
3452 #next unless $t < 0.0013;#d#
3453 if ($t < $min) {
3454 $min = $t;
3455 }
3456 $avg = $avg * 0.99 + $t * 0.01;
3457 }
3458 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3459 exit 0;
3460 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3461 };
3462
2457 $RUNTIME += $TICK; 3463 $RUNTIME += $TICK;
2458 $NEXT_TICK += $TICK; 3464 $NEXT_TICK += $TICK;
2459 3465
2460 $WAIT_FOR_TICK->broadcast; 3466 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2461 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3467 $NEXT_RUNTIME_WRITE = $NOW + 10;
3468 Coro::async_pool {
3469 write_runtime
3470 or warn "ERROR: unable to write runtime file: $!";
3471 };
3472 }
3473
3474# my $AFTER = Event::time;
3475# warn $AFTER - $NOW;#d#
3476
3477 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3478 $sig->send;
3479 }
3480 while (my $sig = shift @WAIT_FOR_TICK) {
3481 $sig->send;
3482 }
3483
3484 $NOW = Event::time;
2462 3485
2463 # if we are delayed by four ticks or more, skip them all 3486 # if we are delayed by four ticks or more, skip them all
2464 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3487 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2465 3488
2466 $TICK_WATCHER->at ($NEXT_TICK); 3489 $TICK_WATCHER->at ($NEXT_TICK);
2467 $TICK_WATCHER->start; 3490 $TICK_WATCHER->start;
3491
3492 $LOAD = ($NOW - $tick_start) / $TICK;
3493 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3494
3495 _post_tick;
3496
3497
2468 }, 3498 },
2469); 3499);
2470 3500
3501{
3502 BDB::max_poll_time $TICK * 0.1;
3503 $BDB_POLL_WATCHER = Event->io (
3504 reentrant => 0,
3505 fd => BDB::poll_fileno,
3506 poll => 'r',
3507 prio => 0,
3508 data => WF_AUTOCANCEL,
3509 cb => \&BDB::poll_cb,
3510 );
3511 BDB::min_parallel 8;
3512
3513 BDB::set_sync_prepare {
3514 my $status;
3515 my $current = $Coro::current;
3516 (
3517 sub {
3518 $status = $!;
3519 $current->ready; undef $current;
3520 },
3521 sub {
3522 Coro::schedule while defined $current;
3523 $! = $status;
3524 },
3525 )
3526 };
3527
3528 unless ($DB_ENV) {
3529 $DB_ENV = BDB::db_env_create;
3530
3531 cf::sync_job {
3532 eval {
3533 BDB::db_env_open
3534 $DB_ENV,
3535 $BDBDIR,
3536 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3537 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3538 0666;
3539
3540 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3541
3542 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3543 $DB_ENV->set_lk_detect;
3544 };
3545
3546 cf::cleanup "db_env_open(db): $@" if $@;
3547 };
3548 }
3549}
3550
3551{
3552 IO::AIO::min_parallel 8;
3553
3554 undef $Coro::AIO::WATCHER;
2471IO::AIO::max_poll_time $TICK * 0.2; 3555 IO::AIO::max_poll_time $TICK * 0.1;
2472
2473$AIO_POLL_WATCHER = Event->io ( 3556 $AIO_POLL_WATCHER = Event->io (
2474 fd => IO::AIO::poll_fileno, 3557 reentrant => 0,
2475 poll => 'r',
2476 prio => 5,
2477 data => WF_AUTOCANCEL,
2478 cb => \&IO::AIO::poll_cb,
2479);
2480
2481$WRITE_RUNTIME_WATCHER = Event->timer (
2482 data => WF_AUTOCANCEL, 3558 data => WF_AUTOCANCEL,
2483 after => 1, 3559 fd => IO::AIO::poll_fileno,
2484 interval => 10, 3560 poll => 'r',
2485 prio => 6, # keep it lowest so it acts like a watchdog 3561 prio => 6,
2486 cb => Coro::unblock_sub { 3562 cb => \&IO::AIO::poll_cb,
2487 write_runtime 3563 );
2488 or warn "ERROR: unable to write runtime file: $!"; 3564}
3565
3566my $_log_backtrace;
3567
3568sub _log_backtrace {
3569 my ($msg, @addr) = @_;
3570
3571 $msg =~ s/\n//;
3572
3573 # limit the # of concurrent backtraces
3574 if ($_log_backtrace < 2) {
3575 ++$_log_backtrace;
3576 async {
3577 my @bt = fork_call {
3578 @addr = map { sprintf "%x", $_ } @addr;
3579 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3580 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3581 or die "addr2line: $!";
3582
3583 my @funcs;
3584 my @res = <$fh>;
3585 chomp for @res;
3586 while (@res) {
3587 my ($func, $line) = splice @res, 0, 2, ();
3588 push @funcs, "[$func] $line";
3589 }
3590
3591 @funcs
3592 };
3593
3594 LOG llevInfo, "[ABT] $msg\n";
3595 LOG llevInfo, "[ABT] $_\n" for @bt;
3596 --$_log_backtrace;
3597 };
3598 } else {
3599 LOG llevInfo, "[ABT] $msg\n";
3600 LOG llevInfo, "[ABT] [suppressed]\n";
2489 }, 3601 }
2490); 3602}
3603
3604# load additional modules
3605use cf::pod;
2491 3606
2492END { cf::emergency_save } 3607END { cf::emergency_save }
2493 3608
24941 36091
2495 3610

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines