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.169 by root, Sun Jan 14 01:09:46 2007 UTC vs.
Revision 1.352 by root, Sun Sep 2 04:57:14 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.3 (); 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; # all users
60our %MAP; # all maps 93our %MAP; # 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).
282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
232 286
233=cut 287=cut
234 288
235our %LOCK; 289our %LOCK;
236 290
… …
256 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
258 } 312 }
259} 313}
260 314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
319}
320
261sub freeze_mainloop { 321sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
263 323
264 my $guard = Coro::guard { 324 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 326 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
270 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
271} 385}
272 386
273=item cf::async { BLOCK } 387=item cf::async { BLOCK }
274 388
275Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
280 394
281BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
282 396
283=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
284 398
285The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
287reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
288 403
289If it must be done, put the blocking parts into C<sync_job>. This will run 404If it must be done, put the blocking parts into C<sync_job>. This will run
290the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
292fast or be very important. 407fast or be very important.
… …
295 410
296sub sync_job(&) { 411sub sync_job(&) {
297 my ($job) = @_; 412 my ($job) = @_;
298 413
299 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
300 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
302 419
303 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 421 # (but this is cancel-safe)
… …
315 432
316 while ($busy) { 433 while ($busy) {
317 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
318 } 435 }
319 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
320 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
321 } else { 445 } else {
322 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
323 447
324 $job->() 448 $job->()
… …
343 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
344 468
345 $coro 469 $coro
346} 470}
347 471
348sub write_runtime { 472=item fork_call { }, $args
349 my $runtime = cf::localdir . "/runtime";
350 473
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 474Executes the given code block with the given arguments in a seperate
352 or return; 475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
353 478
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 479=cut
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return;
357 480
358 aio_fsync $fh 481sub fork_call(&@) {
359 and return; 482 my ($cb, @args) = @_;
360 483
361 close $fh 484 # we seemingly have to make a local copy of the whole thing,
362 or return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious)
363 487
364 aio_rename "$runtime~", $runtime 488 my @res = Coro::Util::fork_eval {
365 and return; 489 reset_signals;
490 &$cb
491 }, @args;
366 492
493 wantarray ? @res : $res[-1]
494}
495
496=item $value = cf::db_get $family => $key
497
498Returns a single value from the environment database.
499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
367 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
610}
611
612=item cf::datalog type => key => value, ...
613
614Log a datalog packet of the given type with the given key-value pairs.
615
616=cut
617
618sub datalog($@) {
619 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
368} 621}
369 622
370=back 623=back
371 624
372=cut 625=cut
… …
379attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
380to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
381 634
382In the following description, CLASS can be any of C<global>, C<object> 635In the following description, CLASS can be any of C<global>, C<object>
383C<player>, C<client> or C<map> (i.e. the attachable objects in 636C<player>, C<client> or C<map> (i.e. the attachable objects in
384crossfire+). 637Crossfire TRT).
385 638
386=over 4 639=over 4
387 640
388=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
389 642
… …
503our @CB_TYPE = (); # registry for type (cf-object class) based events 756our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 757our @CB_MAP = ();
505 758
506my %attachment; 759my %attachment;
507 760
761sub cf::attachable::thawer_merge {
762 # simply override everything except _meta
763 local $_[0]{_meta};
764 %{$_[0]} = %{$_[1]};
765}
766
508sub _attach_cb($$$$) { 767sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 768 my ($registry, $event, $prio, $cb) = @_;
510 769
511 use sort 'stable'; 770 use sort 'stable';
512 771
… …
546 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
547 806
548 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
549 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
550 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
551 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
552 811
553 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
554 my $pkg = shift @arg; 813 my $pkg = shift @arg;
555 814
556 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
… …
585 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
586 } 845 }
587 846
588 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
589 } else { 848 } else {
590 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
591 } 850 }
592 851
593 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
594} 853}
595 854
… …
597 if (ref $_[0]) { 856 if (ref $_[0]) {
598 _object_attach @_; 857 _object_attach @_;
599 } else { 858 } else {
600 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
601 } 860 }
861 _recalc_want;
602}; 862};
603 863
604# all those should be optimised 864# all those should be optimised
605sub cf::attachable::detach { 865sub cf::attachable::detach {
606 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
… …
609 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
610 reattach ($obj); 870 reattach ($obj);
611 } else { 871 } else {
612 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
613 } 873 }
874 _recalc_want;
614}; 875};
615 876
616sub cf::attachable::attached { 877sub cf::attachable::attached {
617 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
618 879
… …
633 "; 894 ";
634 die if $@; 895 die if $@;
635} 896}
636 897
637our $override; 898our $override;
638our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
639 900
640sub override { 901sub override {
641 $override = 1; 902 $override = 1;
642 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
643} 904}
644 905
645sub do_invoke { 906sub do_invoke {
646 my $event = shift; 907 my $event = shift;
647 my $callbacks = shift; 908 my $callbacks = shift;
648 909
649 @invoke_results = (); 910 @INVOKE_RESULTS = ();
650 911
651 local $override; 912 local $override;
652 913
653 for (@$callbacks) { 914 for (@$callbacks) {
654 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
671 932
672Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
673 934
674This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
675removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
676results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
677 938
678=back 939=back
679 940
680=cut 941=cut
681 942
682############################################################################# 943#############################################################################
683# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
684 956
685sub reattach { 957sub reattach {
686 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
687 my ($obj) = @_; 959 my ($obj) = @_;
688 960
… …
741 $filename, length $$rdata, scalar @$objs; 1013 $filename, length $$rdata, scalar @$objs;
742 1014
743 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
744 chmod SAVE_MODE, $fh; 1016 chmod SAVE_MODE, $fh;
745 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
746 aio_fsync $fh; 1018 aio_fsync $fh if $cf::USE_FSYNC;
747 close $fh; 1019 close $fh;
748 1020
749 if (@$objs) { 1021 if (@$objs) {
750 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
751 chmod SAVE_MODE, $fh; 1023 chmod SAVE_MODE, $fh;
752 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1024 my $data = Storable::nfreeze { version => 1, objs => $objs };
753 aio_write $fh, 0, (length $data), $data, 0; 1025 aio_write $fh, 0, (length $data), $data, 0;
754 aio_fsync $fh; 1026 aio_fsync $fh if $cf::USE_FSYNC;
755 close $fh; 1027 close $fh;
756 aio_rename "$filename.pst~", "$filename.pst"; 1028 aio_rename "$filename.pst~", "$filename.pst";
757 } 1029 }
758 } else { 1030 } else {
759 aio_unlink "$filename.pst"; 1031 aio_unlink "$filename.pst";
… …
791 or return; 1063 or return;
792 $av = eval { (Storable::thaw $av)->{objs} }; 1064 $av = eval { (Storable::thaw $av)->{objs} };
793 } 1065 }
794 1066
795 warn sprintf "loading %s (%d)\n", 1067 warn sprintf "loading %s (%d)\n",
796 $filename, length $data, scalar @{$av || []};#d# 1068 $filename, length $data, scalar @{$av || []};
797 return ($data, $av); 1069 return ($data, $av);
798} 1070}
1071
1072=head2 COMMAND CALLBACKS
1073
1074=over 4
1075
1076=cut
799 1077
800############################################################################# 1078#############################################################################
801# command handling &c 1079# command handling &c
802 1080
803=item cf::register_command $name => \&callback($ob,$args); 1081=item cf::register_command $name => \&callback($ob,$args);
… …
816 push @{ $COMMAND{$name} }, [$caller, $cb]; 1094 push @{ $COMMAND{$name} }, [$caller, $cb];
817} 1095}
818 1096
819=item cf::register_extcmd $name => \&callback($pl,$packet); 1097=item cf::register_extcmd $name => \&callback($pl,$packet);
820 1098
821Register a callbackf ro execution when the client sends an extcmd packet. 1099Register a callback for execution when the client sends an (synchronous)
1100extcmd packet. Ext commands will be processed in the order they are
1101received by the server, like other user commands. The first argument is
1102the logged-in player. Ext commands can only be processed after a player
1103has logged in successfully.
822 1104
823If the callback returns something, it is sent back as if reply was being 1105If the callback returns something, it is sent back as if reply was being
824called. 1106called.
825 1107
1108=item cf::register_exticmd $name => \&callback($ns,$packet);
1109
1110Register a callback for execution when the client sends an (asynchronous)
1111exticmd packet. Exti commands are processed by the server as soon as they
1112are received, i.e. out of order w.r.t. other commands. The first argument
1113is a client socket. Exti commands can be received anytime, even before
1114log-in.
1115
1116If the callback returns something, it is sent back as if reply was being
1117called.
1118
826=cut 1119=cut
827 1120
828sub register_extcmd { 1121sub register_extcmd {
829 my ($name, $cb) = @_; 1122 my ($name, $cb) = @_;
830 1123
831 $EXTCMD{$name} = $cb; 1124 $EXTCMD{$name} = $cb;
1125}
1126
1127sub register_exticmd {
1128 my ($name, $cb) = @_;
1129
1130 $EXTICMD{$name} = $cb;
832} 1131}
833 1132
834cf::player->attach ( 1133cf::player->attach (
835 on_command => sub { 1134 on_command => sub {
836 my ($pl, $name, $params) = @_; 1135 my ($pl, $name, $params) = @_;
… …
845 cf::override; 1144 cf::override;
846 }, 1145 },
847 on_extcmd => sub { 1146 on_extcmd => sub {
848 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
849 1148
850 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
851 1150
852 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
853 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
854 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
855 $pl->ext_reply ($msg->{msgid}, %reply);
856 }
857 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
858 } else { 1166 } else {
859 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
860 } 1168 }
861 1169
862 cf::override; 1170 cf::override;
863 }, 1171 },
864); 1172);
865 1173
866sub load_extension {
867 my ($path) = @_;
868
869 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
870 my $base = $1;
871 my $pkg = $1;
872 $pkg =~ s/[^[:word:]]/_/g;
873 $pkg = "ext::$pkg";
874
875 warn "... loading '$path' into '$pkg'\n";
876
877 open my $fh, "<:utf8", $path
878 or die "$path: $!";
879
880 my $source =
881 "package $pkg; use strict; use utf8;\n"
882 . "#line 1 \"$path\"\n{\n"
883 . (do { local $/; <$fh> })
884 . "\n};\n1";
885
886 unless (eval $source) {
887 my $msg = $@ ? "$path: $@\n"
888 : "extension disabled.\n";
889 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
890 warn $@;
891 warn "mandatory extension failed to load, exiting.\n";
892 exit 1;
893 }
894 die $@;
895 }
896
897 push @EXTS, $pkg;
898}
899
900sub load_extensions { 1174sub load_extensions {
1175 cf::sync_job {
1176 my %todo;
1177
901 for my $ext (<$LIBDIR/*.ext>) { 1178 for my $path (<$LIBDIR/*.ext>) {
902 next unless -r $ext; 1179 next unless -r $path;
903 eval { 1180
904 load_extension $ext; 1181 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1182 my $base = $1;
1183 my $pkg = $1;
1184 $pkg =~ s/[^[:word:]]/_/g;
1185 $pkg = "ext::$pkg";
1186
1187 open my $fh, "<:utf8", $path
1188 or die "$path: $!";
1189
1190 my $source = do { local $/; <$fh> };
1191
1192 my %ext = (
1193 path => $path,
1194 base => $base,
1195 pkg => $pkg,
1196 );
1197
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200
1201 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n"
1204 . $source
1205 . "\n};\n1";
1206
1207 $todo{$base} = \%ext;
1208 }
1209
1210 my %done;
1211 while (%todo) {
1212 my $progress;
1213
1214 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip
1217 unless exists $done{$_};
1218 }
1219
1220 warn "... loading '$k' into '$v->{pkg}'\n";
1221
1222 unless (eval $v->{source}) {
1223 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n";
1225
1226 if (exists $v->{meta}{mandatory}) {
1227 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n";
1229 exit 1;
1230 }
1231
1232 warn $msg;
1233 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
905 1 1238 }
906 } or warn "$ext not loaded: $@"; 1239
1240 skip:
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1242 unless $progress;
1243 }
907 } 1244 };
908} 1245}
909 1246
910############################################################################# 1247#############################################################################
911 1248
1249=back
1250
912=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
913 1252
914Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
915 1254
916=cut 1255=cut
… …
928Returns the given player object, loading it if necessary (might block). 1267Returns the given player object, loading it if necessary (might block).
929 1268
930=cut 1269=cut
931 1270
932sub playerdir($) { 1271sub playerdir($) {
933 cf::localdir 1272 "$PLAYERDIR/"
934 . "/"
935 . cf::playerdir
936 . "/"
937 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1273 . (ref $_[0] ? $_[0]->ob->name : $_[0])
938} 1274}
939 1275
940sub path($) { 1276sub path($) {
941 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1277 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
942 1278
943 (playerdir $login) . "/$login.pl" 1279 (playerdir $login) . "/playerdata"
944} 1280}
945 1281
946sub find_active($) { 1282sub find_active($) {
947 $cf::PLAYER{$_[0]} 1283 $cf::PLAYER{$_[0]}
948 and $cf::PLAYER{$_[0]}->active 1284 and $cf::PLAYER{$_[0]}->active
… …
951 1287
952sub exists($) { 1288sub exists($) {
953 my ($login) = @_; 1289 my ($login) = @_;
954 1290
955 $cf::PLAYER{$login} 1291 $cf::PLAYER{$login}
956 or cf::sync_job { !aio_stat $login } 1292 or cf::sync_job { !aio_stat path $login }
957} 1293}
958 1294
959sub find($) { 1295sub find($) {
960 return $cf::PLAYER{$_[0]} || do { 1296 return $cf::PLAYER{$_[0]} || do {
961 my $login = $_[0]; 1297 my $login = $_[0];
962 1298
963 my $guard = cf::lock_acquire "user_find:$login"; 1299 my $guard = cf::lock_acquire "user_find:$login";
964 1300
965 $cf::PLAYER{$_[0]} || do { 1301 $cf::PLAYER{$_[0]} || do {
1302 # rename old playerfiles to new ones
1303 #TODO: remove when no longer required
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl";
1308
966 my $pl = load_pl path $login 1309 my $pl = load_pl path $login
967 or return; 1310 or return;
968 $cf::PLAYER{$login} = $pl 1311 $cf::PLAYER{$login} = $pl
969 } 1312 }
970 } 1313 }
… …
982 1325
983 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
984 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
985 1328
986 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
987 Coro::cede; 1330 cf::cede_to_tick;
988} 1331}
989 1332
990sub new($) { 1333sub new($) {
991 my ($login) = @_; 1334 my ($login) = @_;
992 1335
… …
998 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
999 1342
1000 $self 1343 $self
1001} 1344}
1002 1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1354}
1355
1003=item $pl->quit_character 1356=item $pl->quit_character
1004 1357
1005Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1006be destroyed. May block for a long time. 1359be destroyed. May block for a long time.
1007 1360
1008=cut 1361=cut
1009 1362
1010sub quit_character { 1363sub quit_character {
1011 my ($pl) = @_; 1364 my ($pl) = @_;
1365
1366 my $name = $pl->ob->name;
1012 1367
1013 $pl->{deny_save} = 1; 1368 $pl->{deny_save} = 1;
1014 $pl->password ("*"); # this should lock out the player until we nuked the dir 1369 $pl->password ("*"); # this should lock out the player until we nuked the dir
1015 1370
1016 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1021 my $path = playerdir $pl; 1376 my $path = playerdir $pl;
1022 my $temp = "$path~$cf::RUNTIME~deleting~"; 1377 my $temp = "$path~$cf::RUNTIME~deleting~";
1023 aio_rename $path, $temp; 1378 aio_rename $path, $temp;
1024 delete $cf::PLAYER{$pl->ob->name}; 1379 delete $cf::PLAYER{$pl->ob->name};
1025 $pl->destroy; 1380 $pl->destroy;
1381
1382 my $prefix = qr<^~\Q$name\E/>;
1383
1384 # nuke player maps
1385 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1386
1026 IO::AIO::aio_rmtree $temp; 1387 IO::AIO::aio_rmtree $temp;
1388}
1389
1390=item $pl->kick
1391
1392Kicks a player out of the game. This destroys the connection.
1393
1394=cut
1395
1396sub kick {
1397 my ($pl, $kicker) = @_;
1398
1399 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1400 $pl->killer ("kicked");
1401 $pl->ns->destroy;
1027} 1402}
1028 1403
1029=item cf::player::list_logins 1404=item cf::player::list_logins
1030 1405
1031Returns am arrayref of all valid playernames in the system, can take a 1406Returns am arrayref of all valid playernames in the system, can take a
1032while and may block, so not sync_job-capable, ever. 1407while and may block, so not sync_job-capable, ever.
1033 1408
1034=cut 1409=cut
1035 1410
1036sub list_logins { 1411sub list_logins {
1037 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1412 my $dirs = aio_readdir $PLAYERDIR
1038 or return []; 1413 or return [];
1039 1414
1040 my @logins; 1415 my @logins;
1041 1416
1042 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
… …
1059=cut 1434=cut
1060 1435
1061sub maps($) { 1436sub maps($) {
1062 my ($pl) = @_; 1437 my ($pl) = @_;
1063 1438
1439 $pl = ref $pl ? $pl->ob->name : $pl;
1440
1064 my $files = aio_readdir playerdir $pl 1441 my $files = aio_readdir playerdir $pl
1065 or return; 1442 or return;
1066 1443
1067 my @paths; 1444 my @paths;
1068 1445
1069 for (@$files) { 1446 for (@$files) {
1070 utf8::decode $_; 1447 utf8::decode $_;
1071 next if /\.(?:pl|pst)$/; 1448 next if /\.(?:pl|pst)$/;
1072 next unless /^$PATH_SEP/o; 1449 next unless /^$PATH_SEP/o;
1073 1450
1074 s/\.map$//; 1451 push @paths, cf::map::normalise "~$pl/$_";
1075 push @paths, "~" . $pl->ob->name . "/" . $_;
1076 } 1452 }
1077 1453
1078 \@paths 1454 \@paths
1079} 1455}
1080 1456
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1458
1459Expand crossfire pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGHT])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1478 # replace G<male|female> tags
1479 || s{G<([^>|]*)\|([^>]*)>}{
1480 $self->gender ? $2 : $1
1481 }ge
1482 # replace H<hint text>
1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1490
1491 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g;
1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1500 $_
1501}
1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507
1081=item $player->ext_reply ($msgid, $msgtype, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1082 1509
1083Sends an ext reply to the player. 1510Sends an ext reply to the player.
1084 1511
1085=cut 1512=cut
1086 1513
1087sub ext_reply($$$%) { 1514sub ext_reply($$@) {
1088 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1089 1516
1090 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1091
1092 $self->send ("ext " . cf::to_json \%msg);
1093} 1518}
1094 1519
1095package cf; 1520=item $player->ext_msg ($type, @msg)
1521
1522Sends an ext event to the client.
1523
1524=cut
1525
1526sub ext_msg($$@) {
1527 my ($self, $type, @msg) = @_;
1528
1529 $self->ns->ext_msg ($type, @msg);
1530}
1531
1532=head3 cf::region
1533
1534=over 4
1535
1536=cut
1537
1538package cf::region;
1539
1540=item cf::region::find_by_path $path
1541
1542Tries to decuce the likely region for a map knowing only its path.
1543
1544=cut
1545
1546sub find_by_path($) {
1547 my ($path) = @_;
1548
1549 my ($match, $specificity);
1550
1551 for my $region (list) {
1552 if ($region->{match} && $path =~ $region->{match}) {
1553 ($match, $specificity) = ($region, $region->specificity)
1554 if $region->specificity > $specificity;
1555 }
1556 }
1557
1558 $match
1559}
1096 1560
1097=back 1561=back
1098
1099 1562
1100=head3 cf::map 1563=head3 cf::map
1101 1564
1102=over 4 1565=over 4
1103 1566
… …
1107 1570
1108use Fcntl; 1571use Fcntl;
1109use Coro::AIO; 1572use Coro::AIO;
1110 1573
1111use overload 1574use overload
1112 '""' => \&as_string; 1575 '""' => \&as_string,
1576 fallback => 1;
1113 1577
1114our $MAX_RESET = 3600; 1578our $MAX_RESET = 3600;
1115our $DEFAULT_RESET = 3000; 1579our $DEFAULT_RESET = 3000;
1116 1580
1117sub generate_random_map { 1581sub generate_random_map {
1118 my ($self, $rmp) = @_; 1582 my ($self, $rmp) = @_;
1119
1120 # mit "rum" bekleckern, nicht 1583 # mit "rum" bekleckern, nicht
1121 $self->_create_random_map ( 1584 $self->_create_random_map (
1122 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1585 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1123 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1586 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1124 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1587 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1131 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1594 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1132 (cf::region::find $rmp->{region}), $rmp->{custom} 1595 (cf::region::find $rmp->{region}), $rmp->{custom}
1133 ) 1596 )
1134} 1597}
1135 1598
1599=item cf::map->register ($regex, $prio)
1600
1601Register a handler for the map path matching the given regex at the
1602givne priority (higher is better, built-in handlers have priority 0, the
1603default).
1604
1605=cut
1606
1136sub register { 1607sub register {
1137 my (undef, $regex) = @_; 1608 my (undef, $regex, $prio) = @_;
1138 my $pkg = caller; 1609 my $pkg = caller;
1139 1610
1140 no strict; 1611 no strict;
1141 push @{"$pkg\::ISA"}, __PACKAGE__; 1612 push @{"$pkg\::ISA"}, __PACKAGE__;
1142 1613
1143 $EXT_MAP{$pkg} = qr<$regex>; 1614 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1144} 1615}
1145 1616
1146# also paths starting with '/' 1617# also paths starting with '/'
1147$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1618$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1619
1620sub thawer_merge {
1621 my ($self, $merge) = @_;
1622
1623 # we have to keep some variables in memory intact
1624 local $self->{path};
1625 local $self->{load_path};
1626
1627 $self->SUPER::thawer_merge ($merge);
1628}
1148 1629
1149sub normalise { 1630sub normalise {
1150 my ($path, $base) = @_; 1631 my ($path, $base) = @_;
1632
1633 $path = "$path"; # make sure its a string
1634
1635 $path =~ s/\.map$//;
1151 1636
1152 # map plan: 1637 # map plan:
1153 # 1638 #
1154 # /! non-realised random map exit (special hack!) 1639 # /! non-realised random map exit (special hack!)
1155 # {... are special paths that are not being touched 1640 # {... are special paths that are not being touched
… …
1183 1668
1184 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1669 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1185 1670
1186 $path = normalise $path, $base; 1671 $path = normalise $path, $base;
1187 1672
1188 for my $pkg (keys %EXT_MAP) { 1673 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1189 if ($path =~ $EXT_MAP{$pkg}) { 1674 if ($path =~ $EXT_MAP{$pkg}[1]) {
1190 my $self = bless cf::map::new, $pkg; 1675 my $self = bless cf::map::new, $pkg;
1191 $self->{path} = $path; $self->path ($path); 1676 $self->{path} = $path; $self->path ($path);
1192 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1193 return $self; 1678 return $self;
1194 } 1679 }
1195 } 1680 }
1196 1681
1197 Carp::carp "unable to resolve path '$path'."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1198 () 1683 ()
1199} 1684}
1200 1685
1201sub init { 1686sub init {
1202 my ($self) = @_; 1687 my ($self) = @_;
… …
1217 1702
1218# the original (read-only) location 1703# the original (read-only) location
1219sub load_path { 1704sub load_path {
1220 my ($self) = @_; 1705 my ($self) = @_;
1221 1706
1222 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1707 "$MAPDIR/$self->{path}.map"
1223} 1708}
1224 1709
1225# the temporary/swap location 1710# the temporary/swap location
1226sub save_path { 1711sub save_path {
1227 my ($self) = @_; 1712 my ($self) = @_;
1228 1713
1229 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1230 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1715 "$TMPDIR/$path.map"
1231} 1716}
1232 1717
1233# the unique path, undef == no special unique path 1718# the unique path, undef == no special unique path
1234sub uniq_path { 1719sub uniq_path {
1235 my ($self) = @_; 1720 my ($self) = @_;
1236 1721
1237 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1238 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1723 "$UNIQUEDIR/$path"
1239} 1724}
1240 1725
1241# and all this just because we cannot iterate over 1726# and all this just because we cannot iterate over
1242# all maps in C++... 1727# all maps in C++...
1243sub change_all_map_light { 1728sub change_all_map_light {
… …
1245 1730
1246 $_->change_map_light ($change) 1731 $_->change_map_light ($change)
1247 for grep $_->outdoor, values %cf::MAP; 1732 for grep $_->outdoor, values %cf::MAP;
1248} 1733}
1249 1734
1735sub decay_objects {
1736 my ($self) = @_;
1737
1738 return if $self->{deny_reset};
1739
1740 $self->do_decay_objects;
1741}
1742
1250sub unlink_save { 1743sub unlink_save {
1251 my ($self) = @_; 1744 my ($self) = @_;
1252 1745
1253 utf8::encode (my $save = $self->save_path); 1746 utf8::encode (my $save = $self->save_path);
1254 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1747 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1255 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1748 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1256} 1749}
1257 1750
1258sub load_header_from($) { 1751sub load_header_from($) {
1259 my ($self, $path) = @_; 1752 my ($self, $path) = @_;
1260 1753
1261 utf8::encode $path; 1754 utf8::encode $path;
1262 aio_open $path, O_RDONLY, 0 1755 #aio_open $path, O_RDONLY, 0
1263 or return; 1756 # or return;
1264 1757
1265 $self->_load_header ($path) 1758 $self->_load_header ($path)
1266 or return; 1759 or return;
1267 1760
1268 $self->{load_path} = $path; 1761 $self->{load_path} = $path;
1269 1762
1270 1 1763 1
1271} 1764}
1272 1765
1273sub load_orig { 1766sub load_header_orig {
1274 my ($self) = @_; 1767 my ($self) = @_;
1275 1768
1276 $self->load_header_from ($self->load_path) 1769 $self->load_header_from ($self->load_path)
1277} 1770}
1278 1771
1279sub load_temp { 1772sub load_header_temp {
1280 my ($self) = @_; 1773 my ($self) = @_;
1281 1774
1282 $self->load_header_from ($self->save_path) 1775 $self->load_header_from ($self->save_path)
1776}
1777
1778sub prepare_temp {
1779 my ($self) = @_;
1780
1781 $self->last_access ((delete $self->{last_access})
1782 || $cf::RUNTIME); #d#
1783 # safety
1784 $self->{instantiate_time} = $cf::RUNTIME
1785 if $self->{instantiate_time} > $cf::RUNTIME;
1786}
1787
1788sub prepare_orig {
1789 my ($self) = @_;
1790
1791 $self->{load_original} = 1;
1792 $self->{instantiate_time} = $cf::RUNTIME;
1793 $self->last_access ($cf::RUNTIME);
1794 $self->instantiate;
1283} 1795}
1284 1796
1285sub load_header { 1797sub load_header {
1286 my ($self) = @_; 1798 my ($self) = @_;
1287 1799
1288 if ($self->load_temp) { 1800 if ($self->load_header_temp) {
1289 $self->last_access ((delete $self->{last_access}) 1801 $self->prepare_temp;
1290 || $cf::RUNTIME); #d#
1291 # safety
1292 $self->{instantiate_time} = $cf::RUNTIME
1293 if $self->{instantiate_time} > $cf::RUNTIME;
1294 } else { 1802 } else {
1295 $self->load_orig 1803 $self->load_header_orig
1296 or return; 1804 or return;
1297 1805 $self->prepare_orig;
1298 $self->{load_original} = 1;
1299 $self->{instantiate_time} = $cf::RUNTIME;
1300 $self->last_access ($cf::RUNTIME);
1301 $self->instantiate;
1302 } 1806 }
1807
1808 $self->{deny_reset} = 1
1809 if $self->no_reset;
1810
1811 $self->default_region (cf::region::find_by_path $self->{path})
1812 unless $self->default_region;
1303 1813
1304 1 1814 1
1305} 1815}
1306 1816
1307sub find; 1817sub find;
… …
1320 $map->{last_save} = $cf::RUNTIME; 1830 $map->{last_save} = $cf::RUNTIME;
1321 1831
1322 $map->load_header 1832 $map->load_header
1323 or return; 1833 or return;
1324 1834
1325 if ($map->should_reset) { 1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait;
1326 $map->reset; 1838 $map->reset;
1327 undef $guard; 1839 undef $guard;
1328 $map = find $path 1840 return find $path;
1329 or return;
1330 } 1841 }
1331 1842
1332 $cf::MAP{$path} = $map 1843 $cf::MAP{$path} = $map
1333 } 1844 }
1334} 1845}
1846
1847sub pre_load { }
1848sub post_load { }
1335 1849
1336sub load { 1850sub load {
1337 my ($self) = @_; 1851 my ($self) = @_;
1338 1852
1853 local $self->{deny_reset} = 1; # loading can take a long time
1854
1339 my $path = $self->{path}; 1855 my $path = $self->{path};
1856
1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1340 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1341 1860
1342 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1343 1862
1344 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1345 1864
1346 $self->alloc; 1865 $self->alloc;
1866
1867 $self->pre_load;
1868 cf::cede_to_tick;
1869
1347 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1348 or return; 1871 or return;
1349 1872
1350 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1351 if delete $self->{load_original}; 1874 if delete $self->{load_original};
1352 1875
1353 if (my $uniq = $self->uniq_path) { 1876 if (my $uniq = $self->uniq_path) {
1354 utf8::encode $uniq; 1877 utf8::encode $uniq;
1355 if (aio_open $uniq, O_RDONLY, 0) { 1878 if (aio_open $uniq, O_RDONLY, 0) {
1356 $self->clear_unique_items; 1879 $self->clear_unique_items;
1357 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1358 } 1881 }
1359 } 1882 }
1360 1883
1361 Coro::cede; 1884 cf::cede_to_tick;
1362
1363 # now do the right thing for maps 1885 # now do the right thing for maps
1364 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1365
1366 unless ($self->{deny_activate}) {
1367 $self->decay_objects;
1368 $self->fix_auto_apply;
1369 $self->update_buttons;
1370 Coro::cede;
1371 $self->set_darkness_map;
1372 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1373 unless $self->difficulty; 1888 unless $self->difficulty;
1374 Coro::cede; 1889 cf::cede_to_tick;
1890
1891 unless ($self->{deny_activate}) {
1892 $self->decay_objects;
1893 $self->fix_auto_apply;
1894 $self->update_buttons;
1895 cf::cede_to_tick;
1896 $self->set_darkness_map;
1897 cf::cede_to_tick;
1375 $self->activate; 1898 $self->activate;
1376 } 1899 }
1377 1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1903
1378 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1905 }
1906
1907 $self->post_load;
1379} 1908}
1380 1909
1381sub customise_for { 1910sub customise_for {
1382 my ($self, $ob) = @_; 1911 my ($self, $ob) = @_;
1383 1912
1384 return find "~" . $ob->name . "/" . $self->{path} 1913 return find "~" . $ob->name . "/" . $self->{path}
1385 if $self->per_player; 1914 if $self->per_player;
1386 1915
1916# return find "?party/" . $ob->name . "/" . $self->{path}
1917# if $self->per_party;
1918
1387 $self 1919 $self
1388} 1920}
1389 1921
1390# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1391sub load_diag { 1923sub load_neighbours {
1392 my ($map) = @_; 1924 my ($map) = @_;
1393 1925
1394 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1395 1927
1396 for (0 .. 3) { 1928 for (0 .. 3) {
1397 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1398 or next; 1930 or next;
1399 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1400 or next; 1932 or next;
1401 $neigh->load; 1933 $neigh->load;
1402 1934
1935 push @neigh,
1403 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1404 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1405 } 1938 }
1406 1939
1407 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1408 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1409 or next; 1943 or next;
1410 $neigh->load; 1944 $neigh->load;
1411 } 1945 }
1412} 1946}
1413 1947
… …
1418} 1952}
1419 1953
1420sub do_load_sync { 1954sub do_load_sync {
1421 my ($map) = @_; 1955 my ($map) = @_;
1422 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1423 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1424} 1961}
1425 1962
1426our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1427our $MAP_PREFETCHER = Coro::async { 1964our $MAP_PREFETCHER = undef;
1428 while () {
1429 for my $path (keys %MAP_PREFETCH) {
1430 my $map = find $path
1431 or next;
1432 $map->load;
1433
1434 delete $MAP_PREFETCH{$path};
1435 }
1436 Coro::schedule;
1437 }
1438};
1439 1965
1440sub find_async { 1966sub find_async {
1441 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1442 1968
1443 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1444 1970
1445 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1446 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 }
1974
1975 $MAP_PREFETCH{$path} |= $load;
1976
1977 $MAP_PREFETCHER ||= cf::async {
1978 while (%MAP_PREFETCH) {
1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1980 if (my $map = find $k) {
1981 $map->load if $v;
1982 }
1983
1984 delete $MAP_PREFETCH{$k};
1985 }
1986 }
1987 undef $MAP_PREFETCHER;
1447 } 1988 };
1448
1449 $MAP_PREFETCH{$path} = 0;
1450 $MAP_PREFETCHER->ready; 1989 $MAP_PREFETCHER->prio (6);
1451 1990
1452 () 1991 ()
1453} 1992}
1454 1993
1455sub save { 1994sub save {
1456 my ($self) = @_; 1995 my ($self) = @_;
1457 1996
1458 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1459 1998
1460 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1461 2000
1462 return unless $self->dirty; 2001 return unless $self->dirty;
1463 2002
… …
1486 my ($self) = @_; 2025 my ($self) = @_;
1487 2026
1488 # save first because save cedes 2027 # save first because save cedes
1489 $self->save; 2028 $self->save;
1490 2029
1491 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1492 2031
1493 return if $self->players; 2032 return if $self->players;
1494 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1495 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1496 2035
… …
1500 2039
1501sub reset_at { 2040sub reset_at {
1502 my ($self) = @_; 2041 my ($self) = @_;
1503 2042
1504 # TODO: safety, remove and allow resettable per-player maps 2043 # TODO: safety, remove and allow resettable per-player maps
1505 return 1e99 if $self->isa ("ext::map_per_player");#d#
1506 return 1e99 if $self->{deny_reset}; 2044 return 1e99 if $self->{deny_reset};
1507 2045
1508 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2046 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1509 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2047 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1510 2048
… …
1515 my ($self) = @_; 2053 my ($self) = @_;
1516 2054
1517 $self->reset_at <= $cf::RUNTIME 2055 $self->reset_at <= $cf::RUNTIME
1518} 2056}
1519 2057
1520sub rename {
1521 my ($self, $new_path) = @_;
1522
1523 normalise $new_path;
1524
1525 $self->unlink_save;
1526
1527 delete $cf::MAP{$self->path};
1528 $self->{path} = $new_path; $self->path ($self->{path});
1529 $cf::MAP{$self->path} = $self;
1530
1531 $self->save;
1532}
1533
1534sub reset { 2058sub reset {
1535 my ($self) = @_; 2059 my ($self) = @_;
1536 2060
1537 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2061 my $lock = cf::lock_acquire "map_data:$self->{path}";
1538 2062
1539 return if $self->players; 2063 return if $self->players;
1540 return if $self->isa ("ext::map_per_player");#d#
1541 2064
1542 warn "resetting map ", $self->path;#d# 2065 warn "resetting map ", $self->path;
2066
2067 $self->in_memory (cf::MAP_SWAPPED);
2068
2069 # need to save uniques path
2070 unless ($self->{deny_save}) {
2071 my $uniq = $self->uniq_path; utf8::encode $uniq;
2072
2073 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2074 if $uniq;
2075 }
1543 2076
1544 delete $cf::MAP{$self->path}; 2077 delete $cf::MAP{$self->path};
1545 2078
1546 $self->in_memory (cf::MAP_SWAPPED);
1547 $self->clear; 2079 $self->clear;
1548 2080
1549 $_->clear_links_to ($self) for values %cf::MAP; 2081 $_->clear_links_to ($self) for values %cf::MAP;
1550 2082
1551 $self->unlink_save; 2083 $self->unlink_save;
… …
1555my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
1556 2088
1557sub nuke { 2089sub nuke {
1558 my ($self) = @_; 2090 my ($self) = @_;
1559 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2095 delete $cf::MAP{$self->path};
2096
2097 $self->unlink_save;
2098
2099 bless $self, "cf::map";
2100 delete $self->{deny_reset};
1560 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
1561 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
1562 $self->rename ("{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2104
2105 $cf::MAP{$self->path} = $self;
2106 }
2107
1563 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2109}
2110
2111=item $maps = cf::map::tmp_maps
2112
2113Returns an arrayref with all map paths of currently instantiated and saved
2114maps. May block.
2115
2116=cut
2117
2118sub tmp_maps() {
2119 [
2120 map {
2121 utf8::decode $_;
2122 /\.map$/
2123 ? normalise $_
2124 : ()
2125 } @{ aio_readdir $TMPDIR or [] }
2126 ]
2127}
2128
2129=item $maps = cf::map::random_maps
2130
2131Returns an arrayref with all map paths of currently instantiated and saved
2132random maps. May block.
2133
2134=cut
2135
2136sub random_maps() {
2137 [
2138 map {
2139 utf8::decode $_;
2140 /\.map$/
2141 ? normalise "?random/$_"
2142 : ()
2143 } @{ aio_readdir $RANDOMDIR or [] }
2144 ]
1564} 2145}
1565 2146
1566=item cf::map::unique_maps 2147=item cf::map::unique_maps
1567 2148
1568Returns an arrayref of paths of all shared maps that have 2149Returns an arrayref of paths of all shared maps that have
1569instantiated unique items. May block. 2150instantiated unique items. May block.
1570 2151
1571=cut 2152=cut
1572 2153
1573sub unique_maps() { 2154sub unique_maps() {
1574 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2155 [
1575 or return; 2156 map {
1576
1577 my @paths;
1578
1579 for (@$files) {
1580 utf8::decode $_; 2157 utf8::decode $_;
1581 next if /\.pst$/;
1582 next unless /^$PATH_SEP/o;
1583
1584 s/\.map$//; 2158 /\.map$/
1585 push @paths, $_; 2159 ? normalise $_
2160 : ()
2161 } @{ aio_readdir $UNIQUEDIR or [] }
1586 } 2162 ]
1587
1588 \@paths
1589} 2163}
1590 2164
1591package cf; 2165package cf;
1592 2166
1593=back 2167=back
… …
1639 2213
1640 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2214 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1641 2215
1642 if ($self->{record_replies}) { 2216 if ($self->{record_replies}) {
1643 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2217 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2218
1644 } else { 2219 } else {
2220 my $pl = $self->contr;
2221
2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2223 my $dialog = $pl->{npc_dialog};
2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2225
2226 } else {
1645 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
1646 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2229 }
1647 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
1648} 2241}
1649 2242
1650=item $player_object->may ("access") 2243=item $player_object->may ("access")
1651 2244
1652Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
1684=cut 2277=cut
1685 2278
1686sub link_map { 2279sub link_map {
1687 unless ($LINK_MAP) { 2280 unless ($LINK_MAP) {
1688 $LINK_MAP = cf::map::find "{link}" 2281 $LINK_MAP = cf::map::find "{link}"
1689 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2282 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1690 $LINK_MAP->load; 2283 $LINK_MAP->load;
1691 } 2284 }
1692 2285
1693 $LINK_MAP 2286 $LINK_MAP
1694} 2287}
… …
1699 $self->deactivate_recursive; 2292 $self->deactivate_recursive;
1700 2293
1701 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2294 return if UNIVERSAL::isa $self->map, "ext::map_link";
1702 2295
1703 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2296 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1704 if $self->map; 2297 if $self->map && $self->map->{path} ne "{link}";
1705 2298
1706 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2299 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1707} 2300}
1708 2301
1709sub cf::object::player::leave_link { 2302sub cf::object::player::leave_link {
1710 my ($self, $map, $x, $y) = @_; 2303 my ($self, $map, $x, $y) = @_;
2304
2305 return unless $self->contr->active;
1711 2306
1712 my $link_pos = delete $self->{_link_pos}; 2307 my $link_pos = delete $self->{_link_pos};
1713 2308
1714 unless ($map) { 2309 unless ($map) {
1715 # restore original map position 2310 # restore original map position
… …
1729 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
1730 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
1731 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
1732 2327
1733 $map->load; 2328 $map->load;
1734 $map->load_diag; 2329 $map->load_neighbours;
1735 2330
1736 return unless $self->contr->active; 2331 return unless $self->contr->active;
1737 $self->activate_recursive; 2332 $self->activate_recursive;
2333
2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1738 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
1739} 2336}
1740 2337
1741cf::player->attach ( 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1742 on_logout => sub {
1743 my ($pl) = @_;
1744 2339
1745 # abort map switching before logout 2340Moves the player to the given map-path and coordinates by first freezing
1746 if ($pl->ob->{_link_pos}) { 2341her, loading and preparing them map, calling the provided $check callback
1747 cf::sync_job { 2342that has to return the map if sucecssful, and then unfreezes the player on
1748 $pl->ob->leave_link 2343the new (success) or old (failed) map position. In either case, $done will
1749 }; 2344be called at the end of this process.
1750 }
1751 },
1752 on_login => sub {
1753 my ($pl) = @_;
1754 2345
1755 # try to abort aborted map switching on player login :)
1756 # should happen only on crashes
1757 if ($pl->ob->{_link_pos}) {
1758 $pl->ob->enter_link;
1759 (async {
1760 # we need this sleep as the login has a concurrent enter_exit running
1761 # and this sleep increases chances of the player not ending up in scorn
1762 $pl->ob->reply (undef,
1763 "There was an internal problem at your last logout, "
1764 . "the server will try to bring you to your intended destination in a second.",
1765 cf::NDI_RED);
1766 Coro::Timer::sleep 1;
1767 $pl->ob->leave_link;
1768 })->prio (2);
1769 }
1770 },
1771);
1772
1773=item $player_object->goto ($path, $x, $y)
1774
1775=cut 2346=cut
2347
2348our $GOTOGEN;
1776 2349
1777sub cf::object::player::goto { 2350sub cf::object::player::goto {
1778 my ($self, $path, $x, $y) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2352
2353 # do generation counting so two concurrent goto's will be executed in-order
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1779 2355
1780 $self->enter_link; 2356 $self->enter_link;
1781 2357
1782 (async { 2358 (async {
2359 my $map = eval {
1783 my $map = cf::map::find $path; 2360 my $map = cf::map::find $path;
2361
2362 if ($map) {
1784 $map = $map->customise_for ($self) if $map; 2363 $map = $map->customise_for ($self);
1785 2364 $map = $check->($map) if $check && $map;
1786# warn "entering ", $map->path, " at ($x, $y)\n" 2365 } else {
1787# if $map;
1788
1789 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2367 }
1790 2368
2369 $map
2370 };
2371
2372 if ($@) {
2373 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2374 LOG llevError | logBacktrace, Carp::longmess $@;
2375 }
2376
2377 if ($gen == $self->{_goto_generation}) {
2378 delete $self->{_goto_generation};
1791 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2380 }
2381
2382 $done->() if $done;
1792 })->prio (1); 2383 })->prio (1);
1793} 2384}
1794 2385
1795=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
1796 2387
… …
1798 2389
1799sub parse_random_map_params { 2390sub parse_random_map_params {
1800 my ($spec) = @_; 2391 my ($spec) = @_;
1801 2392
1802 my $rmp = { # defaults 2393 my $rmp = { # defaults
1803 xsize => 10, 2394 xsize => (cf::rndm 15, 40),
1804 ysize => 10, 2395 ysize => (cf::rndm 15, 40),
2396 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2397 #layout => string,
1805 }; 2398 };
1806 2399
1807 for (split /\n/, $spec) { 2400 for (split /\n/, $spec) {
1808 my ($k, $v) = split /\s+/, $_, 2; 2401 my ($k, $v) = split /\s+/, $_, 2;
1809 2402
… …
1813 $rmp 2406 $rmp
1814} 2407}
1815 2408
1816sub prepare_random_map { 2409sub prepare_random_map {
1817 my ($exit) = @_; 2410 my ($exit) = @_;
2411
2412 my $guard = cf::lock_acquire "exit_prepare:$exit";
1818 2413
1819 # all this does is basically replace the /! path by 2414 # all this does is basically replace the /! path by
1820 # a new random map path (?random/...) with a seed 2415 # a new random map path (?random/...) with a seed
1821 # that depends on the exit object 2416 # that depends on the exit object
1822 2417
1823 my $rmp = parse_random_map_params $exit->msg; 2418 my $rmp = parse_random_map_params $exit->msg;
1824 2419
1825 if ($exit->map) { 2420 if ($exit->map) {
1826 $rmp->{region} = $exit->map->region_name; 2421 $rmp->{region} = $exit->region->name;
1827 $rmp->{origin_map} = $exit->map->path; 2422 $rmp->{origin_map} = $exit->map->path;
1828 $rmp->{origin_x} = $exit->x; 2423 $rmp->{origin_x} = $exit->x;
1829 $rmp->{origin_y} = $exit->y; 2424 $rmp->{origin_y} = $exit->y;
1830 } 2425 }
1831 2426
1832 $rmp->{random_seed} ||= $exit->random_seed; 2427 $rmp->{random_seed} ||= $exit->random_seed;
1833 2428
1834 my $data = cf::to_json $rmp; 2429 my $data = cf::to_json $rmp;
1835 my $md5 = Digest::MD5::md5_hex $data; 2430 my $md5 = Digest::MD5::md5_hex $data;
2431 my $meta = "$RANDOMDIR/$md5.meta";
1836 2432
1837 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1838 aio_write $fh, 0, (length $data), $data, 0; 2434 aio_write $fh, 0, (length $data), $data, 0;
2435 undef $fh;
2436 aio_rename "$meta~", $meta;
1839 2437
1840 $exit->slaying ("?random/$md5"); 2438 $exit->slaying ("?random/$md5");
1841 $exit->msg (undef); 2439 $exit->msg (undef);
1842 } 2440 }
1843} 2441}
… …
1845sub cf::object::player::enter_exit { 2443sub cf::object::player::enter_exit {
1846 my ($self, $exit) = @_; 2444 my ($self, $exit) = @_;
1847 2445
1848 return unless $self->type == cf::PLAYER; 2446 return unless $self->type == cf::PLAYER;
1849 2447
2448 if ($exit->slaying eq "/!") {
2449 #TODO: this should de-fi-ni-te-ly not be a sync-job
2450 # the problem is that $exit might not survive long enough
2451 # so it needs to be done right now, right here
2452 cf::sync_job { prepare_random_map $exit };
2453 }
2454
2455 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2456 my $hp = $exit->stats->hp;
2457 my $sp = $exit->stats->sp;
2458
1850 $self->enter_link; 2459 $self->enter_link;
2460
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
1851 2464
1852 (async { 2465 (async {
1853 $self->deactivate_recursive; # just to be sure 2466 $self->deactivate_recursive; # just to be sure
1854 unless (eval { 2467 unless (eval {
1855 prepare_random_map $exit 2468 $self->goto ($slaying, $hp, $sp);
1856 if $exit->slaying eq "/!";
1857
1858 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1859 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1860 2469
1861 1; 2470 1;
1862 }) { 2471 }) {
1863 $self->message ("Something went wrong deep within the crossfire server. " 2472 $self->message ("Something went wrong deep within the crossfire server. "
1864 . "I'll try to bring you back to the map you were before. " 2473 . "I'll try to bring you back to the map you were before. "
1865 . "Please report this to the dungeon master!", 2474 . "Please report this to the dungeon master!",
1866 cf::NDI_UNIQUE | cf::NDI_RED); 2475 cf::NDI_UNIQUE | cf::NDI_RED);
1867 2476
1868 warn "ERROR in enter_exit: $@"; 2477 warn "ERROR in enter_exit: $@";
1869 $self->leave_link; 2478 $self->leave_link;
1870 } 2479 }
1871 })->prio (1); 2480 })->prio (1);
… …
1884 2493
1885sub cf::client::send_drawinfo { 2494sub cf::client::send_drawinfo {
1886 my ($self, $text, $flags) = @_; 2495 my ($self, $text, $flags) = @_;
1887 2496
1888 utf8::encode $text; 2497 utf8::encode $text;
1889 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1890} 2499}
1891 2500
2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2502
2503Send a drawinfo or msg packet to the client, formatting the msg for the
2504client if neccessary. C<$type> should be a string identifying the type of
2505the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet.
2507
2508=cut
2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2525sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_;
2527
2528 $msg = $self->pl->expand_cfpod ($msg);
2529
2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel);
2540 }
2541
2542 $channel = $channel->{id};
2543 }
2544
2545 return unless @extra || length $msg;
2546
2547 if ($self->can_msg) {
2548 # default colour, mask it out
2549 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2550 if $color & cf::NDI_DEF;
2551
2552 $self->send_packet ("msg " . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2554 } else {
2555 if ($color >= 0) {
2556 # replace some tags by gcfclient-compatible ones
2557 for ($msg) {
2558 1 while
2559 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2560 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2561 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2562 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2564 }
2565
2566 $color &= cf::NDI_COLOR_MASK;
2567
2568 utf8::encode $msg;
2569
2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2573 } else {
2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2575 $self->send_packet ("drawinfo $color $msg")
2576 }
2577 }
2578 }
2579}
2580
2581=item $client->ext_msg ($type, @msg)
2582
2583Sends an ext event to the client.
2584
2585=cut
2586
2587sub cf::client::ext_msg($$@) {
2588 my ($self, $type, @msg) = @_;
2589
2590 if ($self->extcmd == 2) {
2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2592 } elsif ($self->extcmd == 1) { # TODO: remove
2593 push @msg, msgtype => "event_$type";
2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 }
2596}
2597
2598=item $client->ext_reply ($msgid, @msg)
2599
2600Sends an ext reply to the client.
2601
2602=cut
2603
2604sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_;
2606
2607 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id;
2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2613 }
2614}
1892 2615
1893=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
1894 2617
1895Queues a query to the client, calling the given callback with 2618Queues a query to the client, calling the given callback with
1896the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2619the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1897C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2620C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1898 2621
1899Queries can fail, so check the return code. Or don't, as queries will become 2622Queries can fail, so check the return code. Or don't, as queries will
1900reliable at some point in the future. 2623become reliable at some point in the future.
1901 2624
1902=cut 2625=cut
1903 2626
1904sub cf::client::query { 2627sub cf::client::query {
1905 my ($self, $flags, $text, $cb) = @_; 2628 my ($self, $flags, $text, $cb) = @_;
… …
1913 utf8::encode $text; 2636 utf8::encode $text;
1914 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2637 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1915 2638
1916 $self->send_packet ($self->{query_queue}[0][0]) 2639 $self->send_packet ($self->{query_queue}[0][0])
1917 if @{ $self->{query_queue} } == 1; 2640 if @{ $self->{query_queue} } == 1;
2641
2642 1
1918} 2643}
1919 2644
1920cf::client->attach ( 2645cf::client->attach (
2646 on_connect => sub {
2647 my ($ns) = @_;
2648
2649 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2650 },
1921 on_reply => sub { 2651 on_reply => sub {
1922 my ($ns, $msg) = @_; 2652 my ($ns, $msg) = @_;
1923 2653
1924 # this weird shuffling is so that direct followup queries 2654 # this weird shuffling is so that direct followup queries
1925 # get handled first 2655 # get handled first
1926 my $queue = delete $ns->{query_queue} 2656 my $queue = delete $ns->{query_queue}
1927 or return; # be conservative, not sure how that can happen, but we saw a crash here 2657 or return; # be conservative, not sure how that can happen, but we saw a crash here
1928 2658
1929 (shift @$queue)->[1]->($msg); 2659 (shift @$queue)->[1]->($msg);
2660 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1930 2661
1931 push @{ $ns->{query_queue} }, @$queue; 2662 push @{ $ns->{query_queue} }, @$queue;
1932 2663
1933 if (@{ $ns->{query_queue} } == @$queue) { 2664 if (@{ $ns->{query_queue} } == @$queue) {
1934 if (@$queue) { 2665 if (@$queue) {
… …
1936 } else { 2667 } else {
1937 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2668 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1938 } 2669 }
1939 } 2670 }
1940 }, 2671 },
2672 on_exticmd => sub {
2673 my ($ns, $buf) = @_;
2674
2675 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2676
2677 if (ref $msg) {
2678 my ($type, $reply, @payload) =
2679 "ARRAY" eq ref $msg
2680 ? @$msg
2681 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2682
2683 my @reply;
2684
2685 if (my $cb = $EXTICMD{$type}) {
2686 @reply = $cb->($ns, @payload);
2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2692 } else {
2693 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2694 }
2695
2696 cf::override;
2697 },
1941); 2698);
1942 2699
1943=item $client->async (\&cb) 2700=item $client->async (\&cb)
1944 2701
1945Create a new coroutine, running the specified callback. The coroutine will 2702Create a new coroutine, running the specified callback. The coroutine will
… …
1986our $safe = new Safe "safe"; 2743our $safe = new Safe "safe";
1987our $safe_hole = new Safe::Hole; 2744our $safe_hole = new Safe::Hole;
1988 2745
1989$SIG{FPE} = 'IGNORE'; 2746$SIG{FPE} = 'IGNORE';
1990 2747
1991$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2748$safe->permit_only (Opcode::opset qw(
2749 :base_core :base_mem :base_orig :base_math
2750 grepstart grepwhile mapstart mapwhile
2751 sort time
2752));
1992 2753
1993# here we export the classes and methods available to script code 2754# here we export the classes and methods available to script code
1994 2755
1995=pod 2756=pod
1996 2757
1997The following fucntions and emthods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
1998 2759
1999 cf::object contr pay_amount pay_player map 2760 cf::object
2761 contr pay_amount pay_player map x y force_find force_add
2762 insert remove name archname title slaying race decrease_ob_nr
2763
2000 cf::object::player player 2764 cf::object::player
2001 cf::player peaceful 2765 player
2002 cf::map trigger 2766
2767 cf::player
2768 peaceful
2769
2770 cf::map
2771 trigger
2003 2772
2004=cut 2773=cut
2005 2774
2006for ( 2775for (
2007 ["cf::object" => qw(contr pay_amount pay_player map)], 2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race
2778 decrease_ob_nr)],
2008 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2009 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2010 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2011) { 2782) {
2012 no strict 'refs'; 2783 no strict 'refs';
… …
2083=back 2854=back
2084 2855
2085=cut 2856=cut
2086 2857
2087############################################################################# 2858#############################################################################
2859# the server's init and main functions
2088 2860
2089=head2 EXTENSION DATABASE SUPPORT 2861sub load_facedata($) {
2862 my ($path) = @_;
2090 2863
2091Crossfire maintains a very simple database for extension use. It can 2864 # HACK to clear player env face cache, we need some signal framework
2092currently store anything that can be serialised using Storable, which 2865 # for this (global event?)
2093excludes objects. 2866 %ext::player_env::MUSIC_FACE_CACHE = ();
2094 2867
2095The parameter C<$family> should best start with the name of the extension 2868 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2096using it, it should be unique.
2097 2869
2098=over 4 2870 warn "loading facedata from $path\n";
2099 2871
2100=item $hashref = cf::db_get $family 2872 my $facedata;
2873 0 < aio_load $path, $facedata
2874 or die "$path: $!";
2101 2875
2102Return a hashref for use by the extension C<$family>, which can be 2876 $facedata = Coro::Storable::thaw $facedata;
2103modified. After modifications, you have to call C<cf::db_dirty> or
2104C<cf::db_sync>.
2105 2877
2106=item $value = cf::db_get $family => $key 2878 $facedata->{version} == 2
2879 or cf::cleanup "$path: version mismatch, cannot proceed.";
2107 2880
2108Returns a single value from the database 2881 # patch in the exptable
2109 2882 $facedata->{resource}{"res/exp_table"} = {
2110=item cf::db_put $family => $hashref 2883 type => FT_RSRC,
2111 2884 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2112Stores the given family hashref into the database. Updates are delayed, if
2113you want the data to be synced to disk immediately, use C<cf::db_sync>.
2114
2115=item cf::db_put $family => $key => $value
2116
2117Stores the given C<$value> in the family hash. Updates are delayed, if you
2118want the data to be synced to disk immediately, use C<cf::db_sync>.
2119
2120=item cf::db_dirty
2121
2122Marks the database as dirty, to be updated at a later time.
2123
2124=item cf::db_sync
2125
2126Immediately write the database to disk I<if it is dirty>.
2127
2128=cut
2129
2130our $DB;
2131
2132{
2133 my $path = cf::localdir . "/database.pst";
2134
2135 sub db_load() {
2136 $DB = stat $path ? Storable::retrieve $path : { };
2137 }
2138
2139 my $pid;
2140
2141 sub db_save() {
2142 waitpid $pid, 0 if $pid;
2143 if (0 == ($pid = fork)) {
2144 $DB->{_meta}{version} = 1;
2145 Storable::nstore $DB, "$path~";
2146 rename "$path~", $path;
2147 cf::_exit 0 if defined $pid;
2148 }
2149 }
2150
2151 my $dirty;
2152
2153 sub db_sync() {
2154 db_save if $dirty;
2155 undef $dirty;
2156 }
2157
2158 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2159 db_sync;
2160 }); 2885 };
2886 cf::cede_to_tick;
2161 2887
2162 sub db_dirty() {
2163 $dirty = 1;
2164 $idle->start;
2165 } 2888 {
2889 my $faces = $facedata->{faceinfo};
2166 2890
2167 sub db_get($;$) { 2891 while (my ($face, $info) = each %$faces) {
2168 @_ >= 2 2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2169 ? $DB->{$_[0]}{$_[1]} 2893 cf::face::set_visibility $idx, $info->{visibility};
2170 : ($DB->{$_[0]} ||= { }) 2894 cf::face::set_magicmap $idx, $info->{magicmap};
2171 } 2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2172 2897
2173 sub db_put($$;$) { 2898 cf::cede_to_tick;
2174 if (@_ >= 3) {
2175 $DB->{$_[0]}{$_[1]} = $_[2];
2176 } else {
2177 $DB->{$_[0]} = $_[1];
2178 }
2179 db_dirty;
2180 }
2181
2182 cf::global->attach (
2183 prio => 10000,
2184 on_cleanup => sub {
2185 db_sync;
2186 }, 2899 }
2187 );
2188}
2189 2900
2190############################################################################# 2901 while (my ($face, $info) = each %$faces) {
2191# the server's main() 2902 next unless $info->{smooth};
2903 my $idx = cf::face::find $face
2904 or next;
2905 if (my $smooth = cf::face::find $info->{smooth}) {
2906 cf::face::set_smooth $idx, $smooth;
2907 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2908 } else {
2909 warn "smooth face '$info->{smooth}' not found for face '$face'";
2910 }
2192 2911
2193sub cfg_load { 2912 cf::cede_to_tick;
2913 }
2914 }
2915
2916 {
2917 my $anims = $facedata->{animinfo};
2918
2919 while (my ($anim, $info) = each %$anims) {
2920 cf::anim::set $anim, $info->{frames}, $info->{facings};
2921 cf::cede_to_tick;
2922 }
2923
2924 cf::anim::invalidate_all; # d'oh
2925 }
2926
2927 {
2928 # TODO: for gcfclient pleasure, we should give resources
2929 # that gcfclient doesn't grok a >10000 face index.
2930 my $res = $facedata->{resource};
2931
2932 my $soundconf = delete $res->{"res/sound.conf"};
2933
2934 while (my ($name, $info) = each %$res) {
2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2937
2938 if ($info->{type} & 1) {
2939 # prepend meta info
2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2946 $data = pack "(w/a*)*", $meta, $info->{data};
2947 } else {
2948 $data = $info->{data};
2949 }
2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2954 cf::cede_to_tick;
2955 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2974 }
2975
2976 1
2977}
2978
2979register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_;
2981
2982 while (my ($k, $v) = each %$want) {
2983 $ns->fx_want ($k, $v);
2984 }
2985};
2986
2987sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2992 load_resource_file "$MAPDIR/regions"
2993 or die "unable to load regions file\n";
2994
2995 for (cf::region::list) {
2996 $_->{match} = qr/$_->{match}/
2997 if exists $_->{match};
2998 }
2999}
3000
3001sub reload_facedata {
3002 load_facedata "$DATADIR/facedata"
3003 or die "unable to load facedata\n";
3004}
3005
3006sub reload_archetypes {
3007 load_resource_file "$DATADIR/archetypes"
3008 or die "unable to load archetypes\n";
3009 #d# NEED to laod twice to resolve forward references
3010 # this really needs to be done in an extra post-pass
3011 # (which needs to be synchronous, so solve it differently)
3012 load_resource_file "$DATADIR/archetypes"
3013 or die "unable to load archetypes\n";
3014}
3015
3016sub reload_treasures {
3017 load_resource_file "$DATADIR/treasures"
3018 or die "unable to load treasurelists\n";
3019}
3020
3021sub reload_resources {
3022 warn "reloading resource files...\n";
3023
3024 reload_regions;
3025 reload_facedata;
3026 #reload_archetypes;#d#
3027 reload_archetypes;
3028 reload_treasures;
3029
3030 warn "finished reloading resource files\n";
3031}
3032
3033sub init {
3034 reload_resources;
3035}
3036
3037sub reload_config {
2194 open my $fh, "<:utf8", cf::confdir . "/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2195 or return; 3039 or return;
2196 3040
2197 local $/; 3041 local $/;
2198 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
2199 3043
… …
2213 3057
2214sub main { 3058sub main {
2215 # we must not ever block the main coroutine 3059 # we must not ever block the main coroutine
2216 local $Coro::idle = sub { 3060 local $Coro::idle = sub {
2217 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3061 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3062 (async {
2218 async { Event::one_event }; 3063 Event::one_event;
3064 })->prio (Coro::PRIO_MAX);
2219 }; 3065 };
2220 3066
2221 cfg_load; 3067 reload_config;
2222 db_load; 3068 db_init;
2223 load_extensions; 3069 load_extensions;
3070
3071 $TICK_WATCHER->start;
2224 Event::loop; 3072 Event::loop;
2225} 3073}
2226 3074
2227############################################################################# 3075#############################################################################
2228# initialisation and cleanup 3076# initialisation and cleanup
2229 3077
2230# install some emergency cleanup handlers 3078# install some emergency cleanup handlers
2231BEGIN { 3079BEGIN {
2232 for my $signal (qw(INT HUP TERM)) { 3080 for my $signal (qw(INT HUP TERM)) {
2233 Event->signal ( 3081 Event->signal (
3082 reentrant => 0,
2234 data => WF_AUTOCANCEL, 3083 data => WF_AUTOCANCEL,
2235 signal => $signal, 3084 signal => $signal,
3085 prio => 0,
2236 cb => sub { 3086 cb => sub {
2237 cf::cleanup "SIG$signal"; 3087 cf::cleanup "SIG$signal";
2238 }, 3088 },
2239 ); 3089 );
2240 } 3090 }
3091}
3092
3093sub write_runtime {
3094 my $runtime = "$LOCALDIR/runtime";
3095
3096 # first touch the runtime file to show we are still running:
3097 # the fsync below can take a very very long time.
3098
3099 IO::AIO::aio_utime $runtime, undef, undef;
3100
3101 my $guard = cf::lock_acquire "write_runtime";
3102
3103 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3104 or return;
3105
3106 my $value = $cf::RUNTIME + 90 + 10;
3107 # 10 is the runtime save interval, for a monotonic clock
3108 # 60 allows for the watchdog to kill the server.
3109
3110 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3111 and return;
3112
3113 # always fsync - this file is important
3114 aio_fsync $fh
3115 and return;
3116
3117 # touch it again to show we are up-to-date
3118 aio_utime $fh, undef, undef;
3119
3120 close $fh
3121 or return;
3122
3123 aio_rename "$runtime~", $runtime
3124 and return;
3125
3126 warn "runtime file written.\n";
3127
3128 1
2241} 3129}
2242 3130
2243sub emergency_save() { 3131sub emergency_save() {
2244 my $freeze_guard = cf::freeze_mainloop; 3132 my $freeze_guard = cf::freeze_mainloop;
2245 3133
… …
2262 my $map = $cf::MAP{$path} or next; 3150 my $map = $cf::MAP{$path} or next;
2263 $map->valid or next; 3151 $map->valid or next;
2264 $map->save; 3152 $map->save;
2265 } 3153 }
2266 warn "end emergency map save\n"; 3154 warn "end emergency map save\n";
3155
3156 warn "begin emergency database checkpoint\n";
3157 BDB::db_env_txn_checkpoint $DB_ENV;
3158 warn "end emergency database checkpoint\n";
2267 }; 3159 };
2268 3160
2269 warn "leave emergency perl save\n"; 3161 warn "leave emergency perl save\n";
2270} 3162}
2271 3163
3164sub post_cleanup {
3165 my ($make_core) = @_;
3166
3167 warn Carp::longmess "post_cleanup backtrace"
3168 if $make_core;
3169}
3170
2272sub reload() { 3171sub do_reload_perl() {
2273 # can/must only be called in main 3172 # can/must only be called in main
2274 if ($Coro::current != $Coro::main) { 3173 if ($Coro::current != $Coro::main) {
2275 warn "can only reload from main coroutine\n"; 3174 warn "can only reload from main coroutine";
2276 return; 3175 return;
2277 } 3176 }
2278 3177
2279 warn "reloading..."; 3178 warn "reloading...";
2280 3179
2281 warn "freezing server"; 3180 warn "entering sync_job";
2282 my $guard = freeze_mainloop; 3181
3182 cf::sync_job {
3183 cf::write_runtime; # external watchdog should not bark
2283 cf::emergency_save; 3184 cf::emergency_save;
3185 cf::write_runtime; # external watchdog should not bark
2284 3186
2285 warn "sync database to disk"; 3187 warn "syncing database to disk";
2286 cf::db_sync; 3188 BDB::db_env_txn_checkpoint $DB_ENV;
2287 IO::AIO::flush;
2288 3189
2289 eval {
2290 # if anything goes wrong in here, we should simply crash as we already saved 3190 # if anything goes wrong in here, we should simply crash as we already saved
2291 3191
2292 warn "cancel all watchers"; 3192 warn "cancelling all WF_AUTOCANCEL watchers";
2293 for (Event::all_watchers) { 3193 for (Event::all_watchers) {
2294 $_->cancel if $_->data & WF_AUTOCANCEL; 3194 $_->cancel if $_->data & WF_AUTOCANCEL;
2295 } 3195 }
2296 3196
3197 warn "flushing outstanding aio requests";
3198 for (;;) {
3199 BDB::flush;
3200 IO::AIO::flush;
3201 Coro::cede;
3202 last unless IO::AIO::nreqs || BDB::nreqs;
3203 warn "iterate...";
3204 }
3205
3206 ++$RELOAD;
3207
2297 warn "cancel all extension coros"; 3208 warn "cancelling all extension coros";
2298 $_->cancel for values %EXT_CORO; 3209 $_->cancel for values %EXT_CORO;
2299 %EXT_CORO = (); 3210 %EXT_CORO = ();
2300 3211
2301 warn "remove commands"; 3212 warn "removing commands";
2302 %COMMAND = (); 3213 %COMMAND = ();
2303 3214
2304 warn "remove ext commands"; 3215 warn "removing ext/exti commands";
2305 %EXTCMD = (); 3216 %EXTCMD = ();
3217 %EXTICMD = ();
2306 3218
2307 warn "unload/nuke all extensions"; 3219 warn "unloading/nuking all extensions";
2308 for my $pkg (@EXTS) { 3220 for my $pkg (@EXTS) {
2309 warn "... unloading $pkg"; 3221 warn "... unloading $pkg";
2310 3222
2311 if (my $cb = $pkg->can ("unload")) { 3223 if (my $cb = $pkg->can ("unload")) {
2312 eval { 3224 eval {
… …
2317 3229
2318 warn "... nuking $pkg"; 3230 warn "... nuking $pkg";
2319 Symbol::delete_package $pkg; 3231 Symbol::delete_package $pkg;
2320 } 3232 }
2321 3233
2322 warn "unload all perl modules loaded from $LIBDIR"; 3234 warn "unloading all perl modules loaded from $LIBDIR";
2323 while (my ($k, $v) = each %INC) { 3235 while (my ($k, $v) = each %INC) {
2324 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3236 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2325 3237
2326 warn "removing <$k>"; 3238 warn "... unloading $k";
2327 delete $INC{$k}; 3239 delete $INC{$k};
2328 3240
2329 $k =~ s/\.pm$//; 3241 $k =~ s/\.pm$//;
2330 $k =~ s/\//::/g; 3242 $k =~ s/\//::/g;
2331 3243
… …
2334 } 3246 }
2335 3247
2336 Symbol::delete_package $k; 3248 Symbol::delete_package $k;
2337 } 3249 }
2338 3250
2339 warn "get rid of safe::, as good as possible"; 3251 warn "getting rid of safe::, as good as possible";
2340 Symbol::delete_package "safe::$_" 3252 Symbol::delete_package "safe::$_"
2341 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3253 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2342 3254
2343 warn "unload cf.pm \"a bit\""; 3255 warn "unloading cf.pm \"a bit\"";
2344 delete $INC{"cf.pm"}; 3256 delete $INC{"cf.pm"};
3257 delete $INC{"cf/pod.pm"};
2345 3258
2346 # don't, removes xs symbols, too, 3259 # don't, removes xs symbols, too,
2347 # and global variables created in xs 3260 # and global variables created in xs
2348 #Symbol::delete_package __PACKAGE__; 3261 #Symbol::delete_package __PACKAGE__;
2349 3262
3263 warn "unload completed, starting to reload now";
3264
2350 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
2351 require cf; 3266 require cf;
2352 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2353 3268
2354 warn "load config and database again"; 3269 warn "loading config and database again";
2355 cf::cfg_load; 3270 cf::reload_config;
2356 cf::db_load;
2357 3271
2358 warn "load extensions"; 3272 warn "loading extensions";
2359 cf::load_extensions; 3273 cf::load_extensions;
2360 3274
2361 warn "reattach attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";
2362 _global_reattach; 3276 _global_reattach; # objects, sockets
2363 warn "reattach attachments to maps"; 3277 warn "reattaching attachments to maps";
2364 reattach $_ for values %MAP; 3278 reattach $_ for values %MAP;
2365 }; 3279 warn "reattaching attachments to players";
3280 reattach $_ for values %PLAYER;
2366 3281
2367 if ($@) { 3282 warn "leaving sync_job";
3283
3284 1
3285 } or do {
2368 warn $@; 3286 warn $@;
2369 warn "error while reloading, exiting."; 3287 warn "error while reloading, exiting.";
2370 exit 1; 3288 exit 1;
2371 } 3289 };
2372 3290
2373 warn "reloaded"; 3291 warn "reloaded";
2374}; 3292};
2375 3293
3294our $RELOAD_WATCHER; # used only during reload
3295
3296sub reload_perl() {
3297 # doing reload synchronously and two reloads happen back-to-back,
3298 # coro crashes during coro_state_free->destroy here.
3299
3300 $RELOAD_WATCHER ||= Event->timer (
3301 reentrant => 0,
3302 after => 0,
3303 data => WF_AUTOCANCEL,
3304 cb => sub {
3305 do_reload_perl;
3306 undef $RELOAD_WATCHER;
3307 },
3308 );
3309}
3310
2376register_command "reload" => sub { 3311register_command "reload" => sub {
2377 my ($who, $arg) = @_; 3312 my ($who, $arg) = @_;
2378 3313
2379 if ($who->flag (FLAG_WIZ)) { 3314 if ($who->flag (FLAG_WIZ)) {
2380 $who->message ("start of reload.");
2381 reload;
2382 $who->message ("end of reload."); 3315 $who->message ("reloading server.");
3316 async { reload_perl };
2383 } 3317 }
2384}; 3318};
2385 3319
2386unshift @INC, $LIBDIR; 3320unshift @INC, $LIBDIR;
2387 3321
3322my $bug_warning = 0;
3323
3324our @WAIT_FOR_TICK;
3325our @WAIT_FOR_TICK_BEGIN;
3326
3327sub wait_for_tick {
3328 return unless $TICK_WATCHER->is_active;
3329 return if $Coro::current == $Coro::main;
3330
3331 my $signal = new Coro::Signal;
3332 push @WAIT_FOR_TICK, $signal;
3333 $signal->wait;
3334}
3335
3336sub wait_for_tick_begin {
3337 return unless $TICK_WATCHER->is_active;
3338 return if $Coro::current == $Coro::main;
3339
3340 my $signal = new Coro::Signal;
3341 push @WAIT_FOR_TICK_BEGIN, $signal;
3342 $signal->wait;
3343}
3344
3345 my $min = 1e6;#d#
3346 my $avg = 10;
2388$TICK_WATCHER = Event->timer ( 3347$TICK_WATCHER = Event->timer (
2389 reentrant => 0, 3348 reentrant => 0,
3349 parked => 1,
2390 prio => 0, 3350 prio => 0,
2391 at => $NEXT_TICK || $TICK, 3351 at => $NEXT_TICK || $TICK,
2392 data => WF_AUTOCANCEL, 3352 data => WF_AUTOCANCEL,
2393 cb => sub { 3353 cb => sub {
3354 if ($Coro::current != $Coro::main) {
3355 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3356 unless ++$bug_warning > 10;
3357 return;
3358 }
3359
2394 $NOW = Event::time; 3360 $NOW = $tick_start = Event::time;
2395 3361
2396 cf::server_tick; # one server iteration 3362 cf::server_tick; # one server iteration
3363
3364 0 && sync_job {#d#
3365 for(1..10) {
3366 my $t = Event::time;
3367 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3368 or die;
3369
3370 $map->width (50);
3371 $map->height (50);
3372 $map->alloc;
3373 $map->_load_objects ("/tmp/x.map", 1);
3374 my $t = Event::time - $t;
3375
3376 #next unless $t < 0.0013;#d#
3377 if ($t < $min) {
3378 $min = $t;
3379 }
3380 $avg = $avg * 0.99 + $t * 0.01;
3381 }
3382 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3383 exit 0;
3384 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3385 };
3386
2397 $RUNTIME += $TICK; 3387 $RUNTIME += $TICK;
2398 $NEXT_TICK += $TICK; 3388 $NEXT_TICK += $TICK;
2399 3389
2400 $WAIT_FOR_TICK->broadcast; 3390 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2401 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3391 $NEXT_RUNTIME_WRITE = $NOW + 10;
3392 Coro::async_pool {
3393 write_runtime
3394 or warn "ERROR: unable to write runtime file: $!";
3395 };
3396 }
3397
3398# my $AFTER = Event::time;
3399# warn $AFTER - $NOW;#d#
3400
3401 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3402 $sig->send;
3403 }
3404 while (my $sig = shift @WAIT_FOR_TICK) {
3405 $sig->send;
3406 }
3407
3408 $NOW = Event::time;
2402 3409
2403 # if we are delayed by four ticks or more, skip them all 3410 # if we are delayed by four ticks or more, skip them all
2404 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3411 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2405 3412
2406 $TICK_WATCHER->at ($NEXT_TICK); 3413 $TICK_WATCHER->at ($NEXT_TICK);
2407 $TICK_WATCHER->start; 3414 $TICK_WATCHER->start;
3415
3416 $LOAD = ($NOW - $tick_start) / $TICK;
3417 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3418
3419 _post_tick;
3420
3421
2408 }, 3422 },
2409); 3423);
2410 3424
3425{
3426 BDB::max_poll_time $TICK * 0.1;
3427 $BDB_POLL_WATCHER = Event->io (
3428 reentrant => 0,
3429 fd => BDB::poll_fileno,
3430 poll => 'r',
3431 prio => 0,
3432 data => WF_AUTOCANCEL,
3433 cb => \&BDB::poll_cb,
3434 );
3435 BDB::min_parallel 8;
3436
3437 BDB::set_sync_prepare {
3438 my $status;
3439 my $current = $Coro::current;
3440 (
3441 sub {
3442 $status = $!;
3443 $current->ready; undef $current;
3444 },
3445 sub {
3446 Coro::schedule while defined $current;
3447 $! = $status;
3448 },
3449 )
3450 };
3451
3452 unless ($DB_ENV) {
3453 $DB_ENV = BDB::db_env_create;
3454
3455 cf::sync_job {
3456 eval {
3457 BDB::db_env_open
3458 $DB_ENV,
3459 $BDBDIR,
3460 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3461 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3462 0666;
3463
3464 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3465
3466 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3467 $DB_ENV->set_lk_detect;
3468 };
3469
3470 cf::cleanup "db_env_open(db): $@" if $@;
3471 };
3472 }
3473}
3474
3475{
3476 IO::AIO::min_parallel 8;
3477
3478 undef $Coro::AIO::WATCHER;
2411IO::AIO::max_poll_time $TICK * 0.2; 3479 IO::AIO::max_poll_time $TICK * 0.1;
2412
2413$AIO_POLL_WATCHER = Event->io ( 3480 $AIO_POLL_WATCHER = Event->io (
2414 fd => IO::AIO::poll_fileno, 3481 reentrant => 0,
2415 poll => 'r',
2416 prio => 5,
2417 data => WF_AUTOCANCEL,
2418 cb => \&IO::AIO::poll_cb,
2419);
2420
2421$WRITE_RUNTIME_WATCHER = Event->timer (
2422 data => WF_AUTOCANCEL, 3482 data => WF_AUTOCANCEL,
2423 after => 0, 3483 fd => IO::AIO::poll_fileno,
2424 interval => 10, 3484 poll => 'r',
2425 cb => sub { 3485 prio => 6,
2426 (Coro::unblock_sub { 3486 cb => \&IO::AIO::poll_cb,
2427 write_runtime 3487 );
2428 or warn "ERROR: unable to write runtime file: $!"; 3488}
3489
3490my $_log_backtrace;
3491
3492sub _log_backtrace {
3493 my ($msg, @addr) = @_;
3494
3495 $msg =~ s/\n//;
3496
3497 # limit the # of concurrent backtraces
3498 if ($_log_backtrace < 2) {
3499 ++$_log_backtrace;
3500 async {
3501 my @bt = fork_call {
3502 @addr = map { sprintf "%x", $_ } @addr;
3503 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3504 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3505 or die "addr2line: $!";
3506
3507 my @funcs;
3508 my @res = <$fh>;
3509 chomp for @res;
3510 while (@res) {
3511 my ($func, $line) = splice @res, 0, 2, ();
3512 push @funcs, "[$func] $line";
3513 }
3514
3515 @funcs
3516 };
3517
3518 LOG llevInfo, "[ABT] $msg\n";
3519 LOG llevInfo, "[ABT] $_\n" for @bt;
3520 --$_log_backtrace;
2429 })->(); 3521 };
3522 } else {
3523 LOG llevInfo, "[ABT] $msg\n";
3524 LOG llevInfo, "[ABT] [suppressed]\n";
2430 }, 3525 }
2431); 3526}
3527
3528# load additional modules
3529use cf::pod;
2432 3530
2433END { cf::emergency_save } 3531END { cf::emergency_save }
2434 3532
24351 35331
2436 3534

Diff Legend

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