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.168 by root, Sun Jan 14 00:37:14 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43:46 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
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) = @_;
960
961 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
688 962
689 my $registry = $obj->registry; 963 my $registry = $obj->registry;
690 964
691 @$registry = (); 965 @$registry = ();
692 966
… …
739 $filename, length $$rdata, scalar @$objs; 1013 $filename, length $$rdata, scalar @$objs;
740 1014
741 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
742 chmod SAVE_MODE, $fh; 1016 chmod SAVE_MODE, $fh;
743 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
744 aio_fsync $fh; 1018 aio_fsync $fh if $cf::USE_FSYNC;
745 close $fh; 1019 close $fh;
746 1020
747 if (@$objs) { 1021 if (@$objs) {
748 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) {
749 chmod SAVE_MODE, $fh; 1023 chmod SAVE_MODE, $fh;
750 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1024 my $data = Storable::nfreeze { version => 1, objs => $objs };
751 aio_write $fh, 0, (length $data), $data, 0; 1025 aio_write $fh, 0, (length $data), $data, 0;
752 aio_fsync $fh; 1026 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 1027 close $fh;
754 aio_rename "$filename.pst~", "$filename.pst"; 1028 aio_rename "$filename.pst~", "$filename.pst";
755 } 1029 }
756 } else { 1030 } else {
757 aio_unlink "$filename.pst"; 1031 aio_unlink "$filename.pst";
… …
789 or return; 1063 or return;
790 $av = eval { (Storable::thaw $av)->{objs} }; 1064 $av = eval { (Storable::thaw $av)->{objs} };
791 } 1065 }
792 1066
793 warn sprintf "loading %s (%d)\n", 1067 warn sprintf "loading %s (%d)\n",
794 $filename, length $data, scalar @{$av || []};#d# 1068 $filename, length $data, scalar @{$av || []};
795 return ($data, $av); 1069 return ($data, $av);
796} 1070}
1071
1072=head2 COMMAND CALLBACKS
1073
1074=over 4
1075
1076=cut
797 1077
798############################################################################# 1078#############################################################################
799# command handling &c 1079# command handling &c
800 1080
801=item cf::register_command $name => \&callback($ob,$args); 1081=item cf::register_command $name => \&callback($ob,$args);
… …
814 push @{ $COMMAND{$name} }, [$caller, $cb]; 1094 push @{ $COMMAND{$name} }, [$caller, $cb];
815} 1095}
816 1096
817=item cf::register_extcmd $name => \&callback($pl,$packet); 1097=item cf::register_extcmd $name => \&callback($pl,$packet);
818 1098
819Register 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.
820 1104
821If 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
822called. 1106called.
823 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
824=cut 1119=cut
825 1120
826sub register_extcmd { 1121sub register_extcmd {
827 my ($name, $cb) = @_; 1122 my ($name, $cb) = @_;
828 1123
829 $EXTCMD{$name} = $cb; 1124 $EXTCMD{$name} = $cb;
1125}
1126
1127sub register_exticmd {
1128 my ($name, $cb) = @_;
1129
1130 $EXTICMD{$name} = $cb;
830} 1131}
831 1132
832cf::player->attach ( 1133cf::player->attach (
833 on_command => sub { 1134 on_command => sub {
834 my ($pl, $name, $params) = @_; 1135 my ($pl, $name, $params) = @_;
… …
843 cf::override; 1144 cf::override;
844 }, 1145 },
845 on_extcmd => sub { 1146 on_extcmd => sub {
846 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
847 1148
848 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
849 1150
850 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
851 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
852 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
853 $pl->ext_reply ($msg->{msgid}, %reply);
854 }
855 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
856 } else { 1166 } else {
857 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
858 } 1168 }
859 1169
860 cf::override; 1170 cf::override;
861 }, 1171 },
862); 1172);
863 1173
864sub load_extension {
865 my ($path) = @_;
866
867 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
868 my $base = $1;
869 my $pkg = $1;
870 $pkg =~ s/[^[:word:]]/_/g;
871 $pkg = "ext::$pkg";
872
873 warn "... loading '$path' into '$pkg'\n";
874
875 open my $fh, "<:utf8", $path
876 or die "$path: $!";
877
878 my $source =
879 "package $pkg; use strict; use utf8;\n"
880 . "#line 1 \"$path\"\n{\n"
881 . (do { local $/; <$fh> })
882 . "\n};\n1";
883
884 unless (eval $source) {
885 my $msg = $@ ? "$path: $@\n"
886 : "extension disabled.\n";
887 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
888 warn $@;
889 warn "mandatory extension failed to load, exiting.\n";
890 exit 1;
891 }
892 die $@;
893 }
894
895 push @EXTS, $pkg;
896}
897
898sub load_extensions { 1174sub load_extensions {
1175 cf::sync_job {
1176 my %todo;
1177
899 for my $ext (<$LIBDIR/*.ext>) { 1178 for my $path (<$LIBDIR/*.ext>) {
900 next unless -r $ext; 1179 next unless -r $path;
901 eval { 1180
902 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;
903 1 1238 }
904 } or warn "$ext not loaded: $@"; 1239
1240 skip:
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1242 unless $progress;
1243 }
905 } 1244 };
906} 1245}
907 1246
908############################################################################# 1247#############################################################################
909 1248
1249=back
1250
910=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
911 1252
912Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
913 1254
914=cut 1255=cut
… …
926Returns the given player object, loading it if necessary (might block). 1267Returns the given player object, loading it if necessary (might block).
927 1268
928=cut 1269=cut
929 1270
930sub playerdir($) { 1271sub playerdir($) {
931 cf::localdir 1272 "$PLAYERDIR/"
932 . "/"
933 . cf::playerdir
934 . "/"
935 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1273 . (ref $_[0] ? $_[0]->ob->name : $_[0])
936} 1274}
937 1275
938sub path($) { 1276sub path($) {
939 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1277 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
940 1278
941 (playerdir $login) . "/$login.pl" 1279 (playerdir $login) . "/playerdata"
942} 1280}
943 1281
944sub find_active($) { 1282sub find_active($) {
945 $cf::PLAYER{$_[0]} 1283 $cf::PLAYER{$_[0]}
946 and $cf::PLAYER{$_[0]}->active 1284 and $cf::PLAYER{$_[0]}->active
… …
949 1287
950sub exists($) { 1288sub exists($) {
951 my ($login) = @_; 1289 my ($login) = @_;
952 1290
953 $cf::PLAYER{$login} 1291 $cf::PLAYER{$login}
954 or cf::sync_job { !aio_stat $login } 1292 or cf::sync_job { !aio_stat path $login }
955} 1293}
956 1294
957sub find($) { 1295sub find($) {
958 return $cf::PLAYER{$_[0]} || do { 1296 return $cf::PLAYER{$_[0]} || do {
959 my $login = $_[0]; 1297 my $login = $_[0];
960 1298
961 my $guard = cf::lock_acquire "user_find:$login"; 1299 my $guard = cf::lock_acquire "user_find:$login";
962 1300
963 $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
964 my $pl = load_pl path $login 1309 my $pl = load_pl path $login
965 or return; 1310 or return;
966 $cf::PLAYER{$login} = $pl 1311 $cf::PLAYER{$login} = $pl
967 } 1312 }
968 } 1313 }
… …
980 1325
981 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
982 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
983 1328
984 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
985 Coro::cede; 1330 cf::cede_to_tick;
986} 1331}
987 1332
988sub new($) { 1333sub new($) {
989 my ($login) = @_; 1334 my ($login) = @_;
990 1335
… …
996 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
997 1342
998 $self 1343 $self
999} 1344}
1000 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
1001=item $pl->quit_character 1356=item $pl->quit_character
1002 1357
1003Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1004be destroyed. May block for a long time. 1359be destroyed. May block for a long time.
1005 1360
1006=cut 1361=cut
1007 1362
1008sub quit_character { 1363sub quit_character {
1009 my ($pl) = @_; 1364 my ($pl) = @_;
1365
1366 my $name = $pl->ob->name;
1010 1367
1011 $pl->{deny_save} = 1; 1368 $pl->{deny_save} = 1;
1012 $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
1013 1370
1014 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1019 my $path = playerdir $pl; 1376 my $path = playerdir $pl;
1020 my $temp = "$path~$cf::RUNTIME~deleting~"; 1377 my $temp = "$path~$cf::RUNTIME~deleting~";
1021 aio_rename $path, $temp; 1378 aio_rename $path, $temp;
1022 delete $cf::PLAYER{$pl->ob->name}; 1379 delete $cf::PLAYER{$pl->ob->name};
1023 $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
1024 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;
1025} 1402}
1026 1403
1027=item cf::player::list_logins 1404=item cf::player::list_logins
1028 1405
1029Returns 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
1030while and may block, so not sync_job-capable, ever. 1407while and may block, so not sync_job-capable, ever.
1031 1408
1032=cut 1409=cut
1033 1410
1034sub list_logins { 1411sub list_logins {
1035 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1412 my $dirs = aio_readdir $PLAYERDIR
1036 or return []; 1413 or return [];
1037 1414
1038 my @logins; 1415 my @logins;
1039 1416
1040 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
… …
1057=cut 1434=cut
1058 1435
1059sub maps($) { 1436sub maps($) {
1060 my ($pl) = @_; 1437 my ($pl) = @_;
1061 1438
1439 $pl = ref $pl ? $pl->ob->name : $pl;
1440
1062 my $files = aio_readdir playerdir $pl 1441 my $files = aio_readdir playerdir $pl
1063 or return; 1442 or return;
1064 1443
1065 my @paths; 1444 my @paths;
1066 1445
1067 for (@$files) { 1446 for (@$files) {
1068 utf8::decode $_; 1447 utf8::decode $_;
1069 next if /\.(?:pl|pst)$/; 1448 next if /\.(?:pl|pst)$/;
1070 next unless /^$PATH_SEP/o; 1449 next unless /^$PATH_SEP/o;
1071 1450
1072 s/\.map$//; 1451 push @paths, cf::map::normalise "~$pl/$_";
1073 push @paths, "~" . $pl->ob->name . "/" . $_;
1074 } 1452 }
1075 1453
1076 \@paths 1454 \@paths
1077} 1455}
1078 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
1079=item $player->ext_reply ($msgid, $msgtype, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1080 1509
1081Sends an ext reply to the player. 1510Sends an ext reply to the player.
1082 1511
1083=cut 1512=cut
1084 1513
1085sub ext_reply($$$%) { 1514sub ext_reply($$@) {
1086 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1087 1516
1088 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1089
1090 $self->send ("ext " . cf::to_json \%msg);
1091} 1518}
1092 1519
1093package 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}
1094 1560
1095=back 1561=back
1096
1097 1562
1098=head3 cf::map 1563=head3 cf::map
1099 1564
1100=over 4 1565=over 4
1101 1566
… …
1105 1570
1106use Fcntl; 1571use Fcntl;
1107use Coro::AIO; 1572use Coro::AIO;
1108 1573
1109use overload 1574use overload
1110 '""' => \&as_string; 1575 '""' => \&as_string,
1576 fallback => 1;
1111 1577
1112our $MAX_RESET = 3600; 1578our $MAX_RESET = 3600;
1113our $DEFAULT_RESET = 3000; 1579our $DEFAULT_RESET = 3000;
1114 1580
1115sub generate_random_map { 1581sub generate_random_map {
1116 my ($self, $rmp) = @_; 1582 my ($self, $rmp) = @_;
1117
1118 # mit "rum" bekleckern, nicht 1583 # mit "rum" bekleckern, nicht
1119 $self->_create_random_map ( 1584 $self->_create_random_map (
1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1585 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1586 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1587 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1129 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1594 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1130 (cf::region::find $rmp->{region}), $rmp->{custom} 1595 (cf::region::find $rmp->{region}), $rmp->{custom}
1131 ) 1596 )
1132} 1597}
1133 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
1134sub register { 1607sub register {
1135 my (undef, $regex) = @_; 1608 my (undef, $regex, $prio) = @_;
1136 my $pkg = caller; 1609 my $pkg = caller;
1137 1610
1138 no strict; 1611 no strict;
1139 push @{"$pkg\::ISA"}, __PACKAGE__; 1612 push @{"$pkg\::ISA"}, __PACKAGE__;
1140 1613
1141 $EXT_MAP{$pkg} = qr<$regex>; 1614 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1142} 1615}
1143 1616
1144# also paths starting with '/' 1617# also paths starting with '/'
1145$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}
1146 1629
1147sub normalise { 1630sub normalise {
1148 my ($path, $base) = @_; 1631 my ($path, $base) = @_;
1632
1633 $path = "$path"; # make sure its a string
1634
1635 $path =~ s/\.map$//;
1149 1636
1150 # map plan: 1637 # map plan:
1151 # 1638 #
1152 # /! non-realised random map exit (special hack!) 1639 # /! non-realised random map exit (special hack!)
1153 # {... are special paths that are not being touched 1640 # {... are special paths that are not being touched
… …
1181 1668
1182 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
1183 1670
1184 $path = normalise $path, $base; 1671 $path = normalise $path, $base;
1185 1672
1186 for my $pkg (keys %EXT_MAP) { 1673 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1187 if ($path =~ $EXT_MAP{$pkg}) { 1674 if ($path =~ $EXT_MAP{$pkg}[1]) {
1188 my $self = bless cf::map::new, $pkg; 1675 my $self = bless cf::map::new, $pkg;
1189 $self->{path} = $path; $self->path ($path); 1676 $self->{path} = $path; $self->path ($path);
1190 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1191 return $self; 1678 return $self;
1192 } 1679 }
1193 } 1680 }
1194 1681
1195 Carp::carp "unable to resolve path '$path'."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1196 () 1683 ()
1197} 1684}
1198 1685
1199sub init { 1686sub init {
1200 my ($self) = @_; 1687 my ($self) = @_;
… …
1215 1702
1216# the original (read-only) location 1703# the original (read-only) location
1217sub load_path { 1704sub load_path {
1218 my ($self) = @_; 1705 my ($self) = @_;
1219 1706
1220 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1707 "$MAPDIR/$self->{path}.map"
1221} 1708}
1222 1709
1223# the temporary/swap location 1710# the temporary/swap location
1224sub save_path { 1711sub save_path {
1225 my ($self) = @_; 1712 my ($self) = @_;
1226 1713
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1715 "$TMPDIR/$path.map"
1229} 1716}
1230 1717
1231# the unique path, undef == no special unique path 1718# the unique path, undef == no special unique path
1232sub uniq_path { 1719sub uniq_path {
1233 my ($self) = @_; 1720 my ($self) = @_;
1234 1721
1235 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1236 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1723 "$UNIQUEDIR/$path"
1237} 1724}
1238 1725
1239# and all this just because we cannot iterate over 1726# and all this just because we cannot iterate over
1240# all maps in C++... 1727# all maps in C++...
1241sub change_all_map_light { 1728sub change_all_map_light {
… …
1243 1730
1244 $_->change_map_light ($change) 1731 $_->change_map_light ($change)
1245 for grep $_->outdoor, values %cf::MAP; 1732 for grep $_->outdoor, values %cf::MAP;
1246} 1733}
1247 1734
1735sub decay_objects {
1736 my ($self) = @_;
1737
1738 return if $self->{deny_reset};
1739
1740 $self->do_decay_objects;
1741}
1742
1248sub unlink_save { 1743sub unlink_save {
1249 my ($self) = @_; 1744 my ($self) = @_;
1250 1745
1251 utf8::encode (my $save = $self->save_path); 1746 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1747 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1748 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1254} 1749}
1255 1750
1256sub load_header_from($) { 1751sub load_header_from($) {
1257 my ($self, $path) = @_; 1752 my ($self, $path) = @_;
1258 1753
1259 utf8::encode $path; 1754 utf8::encode $path;
1260 aio_open $path, O_RDONLY, 0 1755 #aio_open $path, O_RDONLY, 0
1261 or return; 1756 # or return;
1262 1757
1263 $self->_load_header ($path) 1758 $self->_load_header ($path)
1264 or return; 1759 or return;
1265 1760
1266 $self->{load_path} = $path; 1761 $self->{load_path} = $path;
1267 1762
1268 1 1763 1
1269} 1764}
1270 1765
1271sub load_orig { 1766sub load_header_orig {
1272 my ($self) = @_; 1767 my ($self) = @_;
1273 1768
1274 $self->load_header_from ($self->load_path) 1769 $self->load_header_from ($self->load_path)
1275} 1770}
1276 1771
1277sub load_temp { 1772sub load_header_temp {
1278 my ($self) = @_; 1773 my ($self) = @_;
1279 1774
1280 $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;
1281} 1795}
1282 1796
1283sub load_header { 1797sub load_header {
1284 my ($self) = @_; 1798 my ($self) = @_;
1285 1799
1286 if ($self->load_temp) { 1800 if ($self->load_header_temp) {
1287 $self->last_access ((delete $self->{last_access}) 1801 $self->prepare_temp;
1288 || $cf::RUNTIME); #d#
1289 # safety
1290 $self->{instantiate_time} = $cf::RUNTIME
1291 if $self->{instantiate_time} > $cf::RUNTIME;
1292 } else { 1802 } else {
1293 $self->load_orig 1803 $self->load_header_orig
1294 or return; 1804 or return;
1295 1805 $self->prepare_orig;
1296 $self->{load_original} = 1;
1297 $self->{instantiate_time} = $cf::RUNTIME;
1298 $self->last_access ($cf::RUNTIME);
1299 $self->instantiate;
1300 } 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;
1301 1813
1302 1 1814 1
1303} 1815}
1304 1816
1305sub find; 1817sub find;
… …
1318 $map->{last_save} = $cf::RUNTIME; 1830 $map->{last_save} = $cf::RUNTIME;
1319 1831
1320 $map->load_header 1832 $map->load_header
1321 or return; 1833 or return;
1322 1834
1323 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;
1324 $map->reset; 1838 $map->reset;
1325 undef $guard; 1839 undef $guard;
1326 $map = find $path 1840 return find $path;
1327 or return;
1328 } 1841 }
1329 1842
1330 $cf::MAP{$path} = $map 1843 $cf::MAP{$path} = $map
1331 } 1844 }
1332} 1845}
1846
1847sub pre_load { }
1848sub post_load { }
1333 1849
1334sub load { 1850sub load {
1335 my ($self) = @_; 1851 my ($self) = @_;
1336 1852
1853 local $self->{deny_reset} = 1; # loading can take a long time
1854
1337 my $path = $self->{path}; 1855 my $path = $self->{path};
1856
1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1338 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1339 1860
1340 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1341 1862
1342 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1343 1864
1344 $self->alloc; 1865 $self->alloc;
1866
1867 $self->pre_load;
1868 cf::cede_to_tick;
1869
1345 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1346 or return; 1871 or return;
1347 1872
1348 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1349 if delete $self->{load_original}; 1874 if delete $self->{load_original};
1350 1875
1351 if (my $uniq = $self->uniq_path) { 1876 if (my $uniq = $self->uniq_path) {
1352 utf8::encode $uniq; 1877 utf8::encode $uniq;
1353 if (aio_open $uniq, O_RDONLY, 0) { 1878 if (aio_open $uniq, O_RDONLY, 0) {
1354 $self->clear_unique_items; 1879 $self->clear_unique_items;
1355 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1356 } 1881 }
1357 } 1882 }
1358 1883
1359 Coro::cede; 1884 cf::cede_to_tick;
1360
1361 # now do the right thing for maps 1885 # now do the right thing for maps
1362 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1363
1364 unless ($self->{deny_activate}) {
1365 $self->decay_objects;
1366 $self->fix_auto_apply;
1367 $self->update_buttons;
1368 Coro::cede;
1369 $self->set_darkness_map;
1370 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1371 unless $self->difficulty; 1888 unless $self->difficulty;
1372 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;
1373 $self->activate; 1898 $self->activate;
1374 } 1899 }
1375 1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1903
1376 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1905 }
1906
1907 $self->post_load;
1377} 1908}
1378 1909
1379sub customise_for { 1910sub customise_for {
1380 my ($self, $ob) = @_; 1911 my ($self, $ob) = @_;
1381 1912
1382 return find "~" . $ob->name . "/" . $self->{path} 1913 return find "~" . $ob->name . "/" . $self->{path}
1383 if $self->per_player; 1914 if $self->per_player;
1384 1915
1916# return find "?party/" . $ob->name . "/" . $self->{path}
1917# if $self->per_party;
1918
1385 $self 1919 $self
1386} 1920}
1387 1921
1388# 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
1389sub load_diag { 1923sub load_neighbours {
1390 my ($map) = @_; 1924 my ($map) = @_;
1391 1925
1392 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1393 1927
1394 for (0 .. 3) { 1928 for (0 .. 3) {
1395 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1396 or next; 1930 or next;
1397 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1398 or next; 1932 or next;
1399 $neigh->load; 1933 $neigh->load;
1400 1934
1935 push @neigh,
1401 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1402 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1403 } 1938 }
1404 1939
1405 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1406 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1407 or next; 1943 or next;
1408 $neigh->load; 1944 $neigh->load;
1409 } 1945 }
1410} 1946}
1411 1947
… …
1416} 1952}
1417 1953
1418sub do_load_sync { 1954sub do_load_sync {
1419 my ($map) = @_; 1955 my ($map) = @_;
1420 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1421 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1422} 1961}
1423 1962
1424our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1425our $MAP_PREFETCHER = Coro::async { 1964our $MAP_PREFETCHER = undef;
1426 while () {
1427 for my $path (keys %MAP_PREFETCH) {
1428 my $map = find $path
1429 or next;
1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1433 }
1434 Coro::schedule;
1435 }
1436};
1437 1965
1438sub find_async { 1966sub find_async {
1439 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1440 1968
1441 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1442 1970
1443 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1444 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;
1445 } 1988 };
1446
1447 $MAP_PREFETCH{$path} = 0;
1448 $MAP_PREFETCHER->ready; 1989 $MAP_PREFETCHER->prio (6);
1449 1990
1450 () 1991 ()
1451} 1992}
1452 1993
1453sub save { 1994sub save {
1454 my ($self) = @_; 1995 my ($self) = @_;
1455 1996
1456 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1457 1998
1458 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1459 2000
1460 return unless $self->dirty; 2001 return unless $self->dirty;
1461 2002
… …
1484 my ($self) = @_; 2025 my ($self) = @_;
1485 2026
1486 # save first because save cedes 2027 # save first because save cedes
1487 $self->save; 2028 $self->save;
1488 2029
1489 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1490 2031
1491 return if $self->players; 2032 return if $self->players;
1492 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1493 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1494 2035
… …
1498 2039
1499sub reset_at { 2040sub reset_at {
1500 my ($self) = @_; 2041 my ($self) = @_;
1501 2042
1502 # TODO: safety, remove and allow resettable per-player maps 2043 # TODO: safety, remove and allow resettable per-player maps
1503 return 1e99 if $self->isa ("ext::map_per_player");
1504 return 1e99 if $self->{deny_reset}; 2044 return 1e99 if $self->{deny_reset};
1505 2045
1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2046 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1507 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;
1508 2048
… …
1513 my ($self) = @_; 2053 my ($self) = @_;
1514 2054
1515 $self->reset_at <= $cf::RUNTIME 2055 $self->reset_at <= $cf::RUNTIME
1516} 2056}
1517 2057
1518sub rename {
1519 my ($self, $new_path) = @_;
1520
1521 normalise $new_path;
1522
1523 $self->unlink_save;
1524
1525 delete $cf::MAP{$self->path};
1526 $self->{path} = $new_path; $self->path ($self->{path});
1527 $cf::MAP{$self->path} = $self;
1528
1529 $self->save;
1530}
1531
1532sub reset { 2058sub reset {
1533 my ($self) = @_; 2059 my ($self) = @_;
1534 2060
1535 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2061 my $lock = cf::lock_acquire "map_data:$self->{path}";
1536 2062
1537 return if $self->players; 2063 return if $self->players;
1538 return if $self->isa ("ext::map_per_player");#d#
1539 2064
1540 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 }
1541 2076
1542 delete $cf::MAP{$self->path}; 2077 delete $cf::MAP{$self->path};
1543 2078
1544 $self->in_memory (cf::MAP_SWAPPED);
1545 $self->clear; 2079 $self->clear;
1546 2080
1547 $_->clear_links_to ($self) for values %cf::MAP; 2081 $_->clear_links_to ($self) for values %cf::MAP;
1548 2082
1549 $self->unlink_save; 2083 $self->unlink_save;
… …
1553my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
1554 2088
1555sub nuke { 2089sub nuke {
1556 my ($self) = @_; 2090 my ($self) = @_;
1557 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};
1558 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
1559 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
1560 $self->rename ("{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2104
2105 $cf::MAP{$self->path} = $self;
2106 }
2107
1561 $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 ]
1562} 2145}
1563 2146
1564=item cf::map::unique_maps 2147=item cf::map::unique_maps
1565 2148
1566Returns an arrayref of paths of all shared maps that have 2149Returns an arrayref of paths of all shared maps that have
1567instantiated unique items. May block. 2150instantiated unique items. May block.
1568 2151
1569=cut 2152=cut
1570 2153
1571sub unique_maps() { 2154sub unique_maps() {
1572 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2155 [
1573 or return; 2156 map {
1574
1575 my @paths;
1576
1577 for (@$files) {
1578 utf8::decode $_; 2157 utf8::decode $_;
1579 next if /\.pst$/;
1580 next unless /^$PATH_SEP/o;
1581
1582 s/\.map$//; 2158 /\.map$/
1583 push @paths, $_; 2159 ? normalise $_
2160 : ()
2161 } @{ aio_readdir $UNIQUEDIR or [] }
1584 } 2162 ]
1585
1586 \@paths
1587} 2163}
1588 2164
1589package cf; 2165package cf;
1590 2166
1591=back 2167=back
… …
1637 2213
1638 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2214 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1639 2215
1640 if ($self->{record_replies}) { 2216 if ($self->{record_replies}) {
1641 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2217 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2218
1642 } 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 {
1643 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
1644 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2229 }
1645 } 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 (@_);
1646} 2241}
1647 2242
1648=item $player_object->may ("access") 2243=item $player_object->may ("access")
1649 2244
1650Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
1682=cut 2277=cut
1683 2278
1684sub link_map { 2279sub link_map {
1685 unless ($LINK_MAP) { 2280 unless ($LINK_MAP) {
1686 $LINK_MAP = cf::map::find "{link}" 2281 $LINK_MAP = cf::map::find "{link}"
1687 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2282 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1688 $LINK_MAP->load; 2283 $LINK_MAP->load;
1689 } 2284 }
1690 2285
1691 $LINK_MAP 2286 $LINK_MAP
1692} 2287}
… …
1697 $self->deactivate_recursive; 2292 $self->deactivate_recursive;
1698 2293
1699 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2294 return if UNIVERSAL::isa $self->map, "ext::map_link";
1700 2295
1701 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2296 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1702 if $self->map; 2297 if $self->map && $self->map->{path} ne "{link}";
1703 2298
1704 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2299 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1705} 2300}
1706 2301
1707sub cf::object::player::leave_link { 2302sub cf::object::player::leave_link {
1708 my ($self, $map, $x, $y) = @_; 2303 my ($self, $map, $x, $y) = @_;
2304
2305 return unless $self->contr->active;
1709 2306
1710 my $link_pos = delete $self->{_link_pos}; 2307 my $link_pos = delete $self->{_link_pos};
1711 2308
1712 unless ($map) { 2309 unless ($map) {
1713 # restore original map position 2310 # restore original map position
… …
1727 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
1728 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
1729 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
1730 2327
1731 $map->load; 2328 $map->load;
1732 $map->load_diag; 2329 $map->load_neighbours;
1733 2330
1734 return unless $self->contr->active; 2331 return unless $self->contr->active;
1735 $self->activate_recursive; 2332 $self->activate_recursive;
2333
2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1736 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
1737} 2336}
1738 2337
1739cf::player->attach ( 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1740 on_logout => sub {
1741 my ($pl) = @_;
1742 2339
1743 # abort map switching before logout 2340Moves the player to the given map-path and coordinates by first freezing
1744 if ($pl->ob->{_link_pos}) { 2341her, loading and preparing them map, calling the provided $check callback
1745 cf::sync_job { 2342that has to return the map if sucecssful, and then unfreezes the player on
1746 $pl->ob->leave_link 2343the new (success) or old (failed) map position. In either case, $done will
1747 }; 2344be called at the end of this process.
1748 }
1749 },
1750 on_login => sub {
1751 my ($pl) = @_;
1752 2345
1753 # try to abort aborted map switching on player login :)
1754 # should happen only on crashes
1755 if ($pl->ob->{_link_pos}) {
1756 $pl->ob->enter_link;
1757 (async {
1758 # we need this sleep as the login has a concurrent enter_exit running
1759 # and this sleep increases chances of the player not ending up in scorn
1760 $pl->ob->reply (undef,
1761 "There was an internal problem at your last logout, "
1762 . "the server will try to bring you to your intended destination in a second.",
1763 cf::NDI_RED);
1764 Coro::Timer::sleep 1;
1765 $pl->ob->leave_link;
1766 })->prio (2);
1767 }
1768 },
1769);
1770
1771=item $player_object->goto ($path, $x, $y)
1772
1773=cut 2346=cut
2347
2348our $GOTOGEN;
1774 2349
1775sub cf::object::player::goto { 2350sub cf::object::player::goto {
1776 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;
1777 2355
1778 $self->enter_link; 2356 $self->enter_link;
1779 2357
1780 (async { 2358 (async {
2359 my $map = eval {
1781 my $map = cf::map::find $path; 2360 my $map = cf::map::find $path;
2361
2362 if ($map) {
1782 $map = $map->customise_for ($self) if $map; 2363 $map = $map->customise_for ($self);
1783 2364 $map = $check->($map) if $check && $map;
1784# warn "entering ", $map->path, " at ($x, $y)\n" 2365 } else {
1785# if $map;
1786
1787 $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 }
1788 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};
1789 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2380 }
2381
2382 $done->() if $done;
1790 })->prio (1); 2383 })->prio (1);
1791} 2384}
1792 2385
1793=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
1794 2387
… …
1796 2389
1797sub parse_random_map_params { 2390sub parse_random_map_params {
1798 my ($spec) = @_; 2391 my ($spec) = @_;
1799 2392
1800 my $rmp = { # defaults 2393 my $rmp = { # defaults
1801 xsize => 10, 2394 xsize => (cf::rndm 15, 40),
1802 ysize => 10, 2395 ysize => (cf::rndm 15, 40),
2396 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2397 #layout => string,
1803 }; 2398 };
1804 2399
1805 for (split /\n/, $spec) { 2400 for (split /\n/, $spec) {
1806 my ($k, $v) = split /\s+/, $_, 2; 2401 my ($k, $v) = split /\s+/, $_, 2;
1807 2402
… …
1811 $rmp 2406 $rmp
1812} 2407}
1813 2408
1814sub prepare_random_map { 2409sub prepare_random_map {
1815 my ($exit) = @_; 2410 my ($exit) = @_;
2411
2412 my $guard = cf::lock_acquire "exit_prepare:$exit";
1816 2413
1817 # all this does is basically replace the /! path by 2414 # all this does is basically replace the /! path by
1818 # a new random map path (?random/...) with a seed 2415 # a new random map path (?random/...) with a seed
1819 # that depends on the exit object 2416 # that depends on the exit object
1820 2417
1821 my $rmp = parse_random_map_params $exit->msg; 2418 my $rmp = parse_random_map_params $exit->msg;
1822 2419
1823 if ($exit->map) { 2420 if ($exit->map) {
1824 $rmp->{region} = $exit->map->region_name; 2421 $rmp->{region} = $exit->region->name;
1825 $rmp->{origin_map} = $exit->map->path; 2422 $rmp->{origin_map} = $exit->map->path;
1826 $rmp->{origin_x} = $exit->x; 2423 $rmp->{origin_x} = $exit->x;
1827 $rmp->{origin_y} = $exit->y; 2424 $rmp->{origin_y} = $exit->y;
1828 } 2425 }
1829 2426
1830 $rmp->{random_seed} ||= $exit->random_seed; 2427 $rmp->{random_seed} ||= $exit->random_seed;
1831 2428
1832 my $data = cf::to_json $rmp; 2429 my $data = cf::to_json $rmp;
1833 my $md5 = Digest::MD5::md5_hex $data; 2430 my $md5 = Digest::MD5::md5_hex $data;
2431 my $meta = "$RANDOMDIR/$md5.meta";
1834 2432
1835 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) {
1836 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;
1837 2437
1838 $exit->slaying ("?random/$md5"); 2438 $exit->slaying ("?random/$md5");
1839 $exit->msg (undef); 2439 $exit->msg (undef);
1840 } 2440 }
1841} 2441}
… …
1843sub cf::object::player::enter_exit { 2443sub cf::object::player::enter_exit {
1844 my ($self, $exit) = @_; 2444 my ($self, $exit) = @_;
1845 2445
1846 return unless $self->type == cf::PLAYER; 2446 return unless $self->type == cf::PLAYER;
1847 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
1848 $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);
1849 2464
1850 (async { 2465 (async {
1851 $self->deactivate_recursive; # just to be sure 2466 $self->deactivate_recursive; # just to be sure
1852 unless (eval { 2467 unless (eval {
1853 prepare_random_map $exit 2468 $self->goto ($slaying, $hp, $sp);
1854 if $exit->slaying eq "/!";
1855
1856 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1857 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1858 2469
1859 1; 2470 1;
1860 }) { 2471 }) {
1861 $self->message ("Something went wrong deep within the crossfire server. " 2472 $self->message ("Something went wrong deep within the crossfire server. "
1862 . "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. "
1863 . "Please report this to the dungeon master!", 2474 . "Please report this to the dungeon master!",
1864 cf::NDI_UNIQUE | cf::NDI_RED); 2475 cf::NDI_UNIQUE | cf::NDI_RED);
1865 2476
1866 warn "ERROR in enter_exit: $@"; 2477 warn "ERROR in enter_exit: $@";
1867 $self->leave_link; 2478 $self->leave_link;
1868 } 2479 }
1869 })->prio (1); 2480 })->prio (1);
… …
1882 2493
1883sub cf::client::send_drawinfo { 2494sub cf::client::send_drawinfo {
1884 my ($self, $text, $flags) = @_; 2495 my ($self, $text, $flags) = @_;
1885 2496
1886 utf8::encode $text; 2497 utf8::encode $text;
1887 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1888} 2499}
1889 2500
2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2502
2503Send a drawinfo or msg packet to the client, formatting the msg for the
2504client if neccessary. C<$type> should be a string identifying the type of
2505the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet.
2507
2508=cut
2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2525sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_;
2527
2528 $msg = $self->pl->expand_cfpod ($msg);
2529
2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2541 }
2542
2543 $channel = $channel->{id};
2544 }
2545
2546 return unless @extra || length $msg;
2547
2548 if ($self->can_msg) {
2549 # default colour, mask it out
2550 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2551 if $color & cf::NDI_DEF;
2552
2553 $self->send_packet ("msg " . $self->{json_coder}->encode (
2554 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2555 } else {
2556 if ($color >= 0) {
2557 # replace some tags by gcfclient-compatible ones
2558 for ($msg) {
2559 1 while
2560 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2561 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2562 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2563 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2564 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2565 }
2566
2567 $color &= cf::NDI_COLOR_MASK;
2568
2569 utf8::encode $msg;
2570
2571 if (0 && $msg =~ /\[/) {
2572 # COMMAND/INFO
2573 $self->send_packet ("drawextinfo $color 10 8 $msg")
2574 } else {
2575 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2576 $self->send_packet ("drawinfo $color $msg")
2577 }
2578 }
2579 }
2580}
2581
2582=item $client->ext_msg ($type, @msg)
2583
2584Sends an ext event to the client.
2585
2586=cut
2587
2588sub cf::client::ext_msg($$@) {
2589 my ($self, $type, @msg) = @_;
2590
2591 if ($self->extcmd == 2) {
2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2593 } elsif ($self->extcmd == 1) { # TODO: remove
2594 push @msg, msgtype => "event_$type";
2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2596 }
2597}
2598
2599=item $client->ext_reply ($msgid, @msg)
2600
2601Sends an ext reply to the client.
2602
2603=cut
2604
2605sub cf::client::ext_reply($$@) {
2606 my ($self, $id, @msg) = @_;
2607
2608 if ($self->extcmd == 2) {
2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2610 } elsif ($self->extcmd == 1) {
2611 #TODO: version 1, remove
2612 unshift @msg, msgtype => "reply", msgid => $id;
2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2614 }
2615}
1890 2616
1891=item $success = $client->query ($flags, "text", \&cb) 2617=item $success = $client->query ($flags, "text", \&cb)
1892 2618
1893Queues a query to the client, calling the given callback with 2619Queues a query to the client, calling the given callback with
1894the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2620the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1895C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2621C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1896 2622
1897Queries can fail, so check the return code. Or don't, as queries will become 2623Queries can fail, so check the return code. Or don't, as queries will
1898reliable at some point in the future. 2624become reliable at some point in the future.
1899 2625
1900=cut 2626=cut
1901 2627
1902sub cf::client::query { 2628sub cf::client::query {
1903 my ($self, $flags, $text, $cb) = @_; 2629 my ($self, $flags, $text, $cb) = @_;
… …
1911 utf8::encode $text; 2637 utf8::encode $text;
1912 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2638 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1913 2639
1914 $self->send_packet ($self->{query_queue}[0][0]) 2640 $self->send_packet ($self->{query_queue}[0][0])
1915 if @{ $self->{query_queue} } == 1; 2641 if @{ $self->{query_queue} } == 1;
2642
2643 1
1916} 2644}
1917 2645
1918cf::client->attach ( 2646cf::client->attach (
2647 on_connect => sub {
2648 my ($ns) = @_;
2649
2650 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2651 },
1919 on_reply => sub { 2652 on_reply => sub {
1920 my ($ns, $msg) = @_; 2653 my ($ns, $msg) = @_;
1921 2654
1922 # this weird shuffling is so that direct followup queries 2655 # this weird shuffling is so that direct followup queries
1923 # get handled first 2656 # get handled first
1924 my $queue = delete $ns->{query_queue} 2657 my $queue = delete $ns->{query_queue}
1925 or return; # be conservative, not sure how that can happen, but we saw a crash here 2658 or return; # be conservative, not sure how that can happen, but we saw a crash here
1926 2659
1927 (shift @$queue)->[1]->($msg); 2660 (shift @$queue)->[1]->($msg);
2661 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1928 2662
1929 push @{ $ns->{query_queue} }, @$queue; 2663 push @{ $ns->{query_queue} }, @$queue;
1930 2664
1931 if (@{ $ns->{query_queue} } == @$queue) { 2665 if (@{ $ns->{query_queue} } == @$queue) {
1932 if (@$queue) { 2666 if (@$queue) {
… …
1934 } else { 2668 } else {
1935 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2669 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1936 } 2670 }
1937 } 2671 }
1938 }, 2672 },
2673 on_exticmd => sub {
2674 my ($ns, $buf) = @_;
2675
2676 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2677
2678 if (ref $msg) {
2679 my ($type, $reply, @payload) =
2680 "ARRAY" eq ref $msg
2681 ? @$msg
2682 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2683
2684 my @reply;
2685
2686 if (my $cb = $EXTICMD{$type}) {
2687 @reply = $cb->($ns, @payload);
2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2693 } else {
2694 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2695 }
2696
2697 cf::override;
2698 },
1939); 2699);
1940 2700
1941=item $client->async (\&cb) 2701=item $client->async (\&cb)
1942 2702
1943Create a new coroutine, running the specified callback. The coroutine will 2703Create a new coroutine, running the specified callback. The coroutine will
… …
1984our $safe = new Safe "safe"; 2744our $safe = new Safe "safe";
1985our $safe_hole = new Safe::Hole; 2745our $safe_hole = new Safe::Hole;
1986 2746
1987$SIG{FPE} = 'IGNORE'; 2747$SIG{FPE} = 'IGNORE';
1988 2748
1989$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2749$safe->permit_only (Opcode::opset qw(
2750 :base_core :base_mem :base_orig :base_math
2751 grepstart grepwhile mapstart mapwhile
2752 sort time
2753));
1990 2754
1991# here we export the classes and methods available to script code 2755# here we export the classes and methods available to script code
1992 2756
1993=pod 2757=pod
1994 2758
1995The following fucntions and emthods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
1996 2760
1997 cf::object contr pay_amount pay_player map 2761 cf::object
2762 contr pay_amount pay_player map x y force_find force_add
2763 insert remove name archname title slaying race decrease_ob_nr
2764
1998 cf::object::player player 2765 cf::object::player
1999 cf::player peaceful 2766 player
2000 cf::map trigger 2767
2768 cf::player
2769 peaceful
2770
2771 cf::map
2772 trigger
2001 2773
2002=cut 2774=cut
2003 2775
2004for ( 2776for (
2005 ["cf::object" => qw(contr pay_amount pay_player map)], 2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2778 insert remove inv name archname title slaying race
2779 decrease_ob_nr)],
2006 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2007 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2008 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2009) { 2783) {
2010 no strict 'refs'; 2784 no strict 'refs';
… …
2081=back 2855=back
2082 2856
2083=cut 2857=cut
2084 2858
2085############################################################################# 2859#############################################################################
2860# the server's init and main functions
2086 2861
2087=head2 EXTENSION DATABASE SUPPORT 2862sub load_facedata($) {
2863 my ($path) = @_;
2088 2864
2089Crossfire maintains a very simple database for extension use. It can 2865 # HACK to clear player env face cache, we need some signal framework
2090currently store anything that can be serialised using Storable, which 2866 # for this (global event?)
2091excludes objects. 2867 %ext::player_env::MUSIC_FACE_CACHE = ();
2092 2868
2093The parameter C<$family> should best start with the name of the extension 2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2094using it, it should be unique.
2095 2870
2096=over 4 2871 warn "loading facedata from $path\n";
2097 2872
2098=item $hashref = cf::db_get $family 2873 my $facedata;
2874 0 < aio_load $path, $facedata
2875 or die "$path: $!";
2099 2876
2100Return a hashref for use by the extension C<$family>, which can be 2877 $facedata = Coro::Storable::thaw $facedata;
2101modified. After modifications, you have to call C<cf::db_dirty> or
2102C<cf::db_sync>.
2103 2878
2104=item $value = cf::db_get $family => $key 2879 $facedata->{version} == 2
2880 or cf::cleanup "$path: version mismatch, cannot proceed.";
2105 2881
2106Returns a single value from the database 2882 # patch in the exptable
2107 2883 $facedata->{resource}{"res/exp_table"} = {
2108=item cf::db_put $family => $hashref 2884 type => FT_RSRC,
2109 2885 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2110Stores the given family hashref into the database. Updates are delayed, if
2111you want the data to be synced to disk immediately, use C<cf::db_sync>.
2112
2113=item cf::db_put $family => $key => $value
2114
2115Stores the given C<$value> in the family hash. Updates are delayed, if you
2116want the data to be synced to disk immediately, use C<cf::db_sync>.
2117
2118=item cf::db_dirty
2119
2120Marks the database as dirty, to be updated at a later time.
2121
2122=item cf::db_sync
2123
2124Immediately write the database to disk I<if it is dirty>.
2125
2126=cut
2127
2128our $DB;
2129
2130{
2131 my $path = cf::localdir . "/database.pst";
2132
2133 sub db_load() {
2134 $DB = stat $path ? Storable::retrieve $path : { };
2135 }
2136
2137 my $pid;
2138
2139 sub db_save() {
2140 waitpid $pid, 0 if $pid;
2141 if (0 == ($pid = fork)) {
2142 $DB->{_meta}{version} = 1;
2143 Storable::nstore $DB, "$path~";
2144 rename "$path~", $path;
2145 cf::_exit 0 if defined $pid;
2146 }
2147 }
2148
2149 my $dirty;
2150
2151 sub db_sync() {
2152 db_save if $dirty;
2153 undef $dirty;
2154 }
2155
2156 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2157 db_sync;
2158 }); 2886 };
2887 cf::cede_to_tick;
2159 2888
2160 sub db_dirty() {
2161 $dirty = 1;
2162 $idle->start;
2163 } 2889 {
2890 my $faces = $facedata->{faceinfo};
2164 2891
2165 sub db_get($;$) { 2892 while (my ($face, $info) = each %$faces) {
2166 @_ >= 2 2893 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2167 ? $DB->{$_[0]}{$_[1]} 2894 cf::face::set_visibility $idx, $info->{visibility};
2168 : ($DB->{$_[0]} ||= { }) 2895 cf::face::set_magicmap $idx, $info->{magicmap};
2169 } 2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2170 2898
2171 sub db_put($$;$) { 2899 cf::cede_to_tick;
2172 if (@_ >= 3) {
2173 $DB->{$_[0]}{$_[1]} = $_[2];
2174 } else {
2175 $DB->{$_[0]} = $_[1];
2176 }
2177 db_dirty;
2178 }
2179
2180 cf::global->attach (
2181 prio => 10000,
2182 on_cleanup => sub {
2183 db_sync;
2184 }, 2900 }
2185 );
2186}
2187 2901
2188############################################################################# 2902 while (my ($face, $info) = each %$faces) {
2189# the server's main() 2903 next unless $info->{smooth};
2904 my $idx = cf::face::find $face
2905 or next;
2906 if (my $smooth = cf::face::find $info->{smooth}) {
2907 cf::face::set_smooth $idx, $smooth;
2908 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2909 } else {
2910 warn "smooth face '$info->{smooth}' not found for face '$face'";
2911 }
2190 2912
2191sub cfg_load { 2913 cf::cede_to_tick;
2914 }
2915 }
2916
2917 {
2918 my $anims = $facedata->{animinfo};
2919
2920 while (my ($anim, $info) = each %$anims) {
2921 cf::anim::set $anim, $info->{frames}, $info->{facings};
2922 cf::cede_to_tick;
2923 }
2924
2925 cf::anim::invalidate_all; # d'oh
2926 }
2927
2928 {
2929 # TODO: for gcfclient pleasure, we should give resources
2930 # that gcfclient doesn't grok a >10000 face index.
2931 my $res = $facedata->{resource};
2932
2933 my $soundconf = delete $res->{"res/sound.conf"};
2934
2935 while (my ($name, $info) = each %$res) {
2936 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data;
2938
2939 if ($info->{type} & 1) {
2940 # prepend meta info
2941
2942 my $meta = $enc->encode ({
2943 name => $name,
2944 %{ $info->{meta} || {} },
2945 });
2946
2947 $data = pack "(w/a*)*", $meta, $info->{data};
2948 } else {
2949 $data = $info->{data};
2950 }
2951
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2953 cf::face::set_type $idx, $info->{type};
2954
2955 cf::cede_to_tick;
2956 }
2957
2958 if ($soundconf) {
2959 $soundconf = $enc->decode (delete $soundconf->{data});
2960
2961 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2962 my $sound = $soundconf->{compat}[$_]
2963 or next;
2964
2965 my $face = cf::face::find "sound/$sound->[1]";
2966 cf::sound::set $sound->[0] => $face;
2967 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2968 }
2969
2970 while (my ($k, $v) = each %{$soundconf->{event}}) {
2971 my $face = cf::face::find "sound/$v";
2972 cf::sound::set $k => $face;
2973 }
2974 }
2975 }
2976
2977 1
2978}
2979
2980register_exticmd fx_want => sub {
2981 my ($ns, $want) = @_;
2982
2983 while (my ($k, $v) = each %$want) {
2984 $ns->fx_want ($k, $v);
2985 }
2986};
2987
2988sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2993 load_resource_file "$MAPDIR/regions"
2994 or die "unable to load regions file\n";
2995
2996 for (cf::region::list) {
2997 $_->{match} = qr/$_->{match}/
2998 if exists $_->{match};
2999 }
3000}
3001
3002sub reload_facedata {
3003 load_facedata "$DATADIR/facedata"
3004 or die "unable to load facedata\n";
3005}
3006
3007sub reload_archetypes {
3008 load_resource_file "$DATADIR/archetypes"
3009 or die "unable to load archetypes\n";
3010 #d# NEED to laod twice to resolve forward references
3011 # this really needs to be done in an extra post-pass
3012 # (which needs to be synchronous, so solve it differently)
3013 load_resource_file "$DATADIR/archetypes"
3014 or die "unable to load archetypes\n";
3015}
3016
3017sub reload_treasures {
3018 load_resource_file "$DATADIR/treasures"
3019 or die "unable to load treasurelists\n";
3020}
3021
3022sub reload_resources {
3023 warn "reloading resource files...\n";
3024
3025 reload_regions;
3026 reload_facedata;
3027 #reload_archetypes;#d#
3028 reload_archetypes;
3029 reload_treasures;
3030
3031 warn "finished reloading resource files\n";
3032}
3033
3034sub init {
3035 reload_resources;
3036}
3037
3038sub reload_config {
2192 open my $fh, "<:utf8", cf::confdir . "/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
2193 or return; 3040 or return;
2194 3041
2195 local $/; 3042 local $/;
2196 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
2197 3044
… …
2211 3058
2212sub main { 3059sub main {
2213 # we must not ever block the main coroutine 3060 # we must not ever block the main coroutine
2214 local $Coro::idle = sub { 3061 local $Coro::idle = sub {
2215 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3062 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3063 (async {
2216 async { Event::one_event }; 3064 Event::one_event;
3065 })->prio (Coro::PRIO_MAX);
2217 }; 3066 };
2218 3067
2219 cfg_load; 3068 reload_config;
2220 db_load; 3069 db_init;
2221 load_extensions; 3070 load_extensions;
3071
3072 $TICK_WATCHER->start;
2222 Event::loop; 3073 Event::loop;
2223} 3074}
2224 3075
2225############################################################################# 3076#############################################################################
2226# initialisation and cleanup 3077# initialisation and cleanup
2227 3078
2228# install some emergency cleanup handlers 3079# install some emergency cleanup handlers
2229BEGIN { 3080BEGIN {
2230 for my $signal (qw(INT HUP TERM)) { 3081 for my $signal (qw(INT HUP TERM)) {
2231 Event->signal ( 3082 Event->signal (
3083 reentrant => 0,
2232 data => WF_AUTOCANCEL, 3084 data => WF_AUTOCANCEL,
2233 signal => $signal, 3085 signal => $signal,
3086 prio => 0,
2234 cb => sub { 3087 cb => sub {
2235 cf::cleanup "SIG$signal"; 3088 cf::cleanup "SIG$signal";
2236 }, 3089 },
2237 ); 3090 );
2238 } 3091 }
3092}
3093
3094sub write_runtime {
3095 my $runtime = "$LOCALDIR/runtime";
3096
3097 # first touch the runtime file to show we are still running:
3098 # the fsync below can take a very very long time.
3099
3100 IO::AIO::aio_utime $runtime, undef, undef;
3101
3102 my $guard = cf::lock_acquire "write_runtime";
3103
3104 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3105 or return;
3106
3107 my $value = $cf::RUNTIME + 90 + 10;
3108 # 10 is the runtime save interval, for a monotonic clock
3109 # 60 allows for the watchdog to kill the server.
3110
3111 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3112 and return;
3113
3114 # always fsync - this file is important
3115 aio_fsync $fh
3116 and return;
3117
3118 # touch it again to show we are up-to-date
3119 aio_utime $fh, undef, undef;
3120
3121 close $fh
3122 or return;
3123
3124 aio_rename "$runtime~", $runtime
3125 and return;
3126
3127 warn "runtime file written.\n";
3128
3129 1
2239} 3130}
2240 3131
2241sub emergency_save() { 3132sub emergency_save() {
2242 my $freeze_guard = cf::freeze_mainloop; 3133 my $freeze_guard = cf::freeze_mainloop;
2243 3134
… …
2260 my $map = $cf::MAP{$path} or next; 3151 my $map = $cf::MAP{$path} or next;
2261 $map->valid or next; 3152 $map->valid or next;
2262 $map->save; 3153 $map->save;
2263 } 3154 }
2264 warn "end emergency map save\n"; 3155 warn "end emergency map save\n";
3156
3157 warn "begin emergency database checkpoint\n";
3158 BDB::db_env_txn_checkpoint $DB_ENV;
3159 warn "end emergency database checkpoint\n";
2265 }; 3160 };
2266 3161
2267 warn "leave emergency perl save\n"; 3162 warn "leave emergency perl save\n";
2268} 3163}
2269 3164
3165sub post_cleanup {
3166 my ($make_core) = @_;
3167
3168 warn Carp::longmess "post_cleanup backtrace"
3169 if $make_core;
3170}
3171
2270sub reload() { 3172sub do_reload_perl() {
2271 # can/must only be called in main 3173 # can/must only be called in main
2272 if ($Coro::current != $Coro::main) { 3174 if ($Coro::current != $Coro::main) {
2273 warn "can only reload from main coroutine\n"; 3175 warn "can only reload from main coroutine";
2274 return; 3176 return;
2275 } 3177 }
2276 3178
2277 warn "reloading..."; 3179 warn "reloading...";
2278 3180
2279 warn "freezing server"; 3181 warn "entering sync_job";
2280 my $guard = freeze_mainloop; 3182
3183 cf::sync_job {
3184 cf::write_runtime; # external watchdog should not bark
2281 cf::emergency_save; 3185 cf::emergency_save;
3186 cf::write_runtime; # external watchdog should not bark
2282 3187
2283 warn "sync database to disk"; 3188 warn "syncing database to disk";
2284 cf::db_sync; 3189 BDB::db_env_txn_checkpoint $DB_ENV;
2285 IO::AIO::flush;
2286 3190
2287 eval {
2288 # if anything goes wrong in here, we should simply crash as we already saved 3191 # if anything goes wrong in here, we should simply crash as we already saved
2289 3192
2290 warn "cancel all watchers"; 3193 warn "cancelling all WF_AUTOCANCEL watchers";
2291 for (Event::all_watchers) { 3194 for (Event::all_watchers) {
2292 $_->cancel if $_->data & WF_AUTOCANCEL; 3195 $_->cancel if $_->data & WF_AUTOCANCEL;
2293 } 3196 }
2294 3197
3198 warn "flushing outstanding aio requests";
3199 for (;;) {
3200 BDB::flush;
3201 IO::AIO::flush;
3202 Coro::cede;
3203 last unless IO::AIO::nreqs || BDB::nreqs;
3204 warn "iterate...";
3205 }
3206
3207 ++$RELOAD;
3208
2295 warn "cancel all extension coros"; 3209 warn "cancelling all extension coros";
2296 $_->cancel for values %EXT_CORO; 3210 $_->cancel for values %EXT_CORO;
2297 %EXT_CORO = (); 3211 %EXT_CORO = ();
2298 3212
2299 warn "remove commands"; 3213 warn "removing commands";
2300 %COMMAND = (); 3214 %COMMAND = ();
2301 3215
2302 warn "remove ext commands"; 3216 warn "removing ext/exti commands";
2303 %EXTCMD = (); 3217 %EXTCMD = ();
3218 %EXTICMD = ();
2304 3219
2305 warn "unload/nuke all extensions"; 3220 warn "unloading/nuking all extensions";
2306 for my $pkg (@EXTS) { 3221 for my $pkg (@EXTS) {
2307 warn "... unloading $pkg"; 3222 warn "... unloading $pkg";
2308 3223
2309 if (my $cb = $pkg->can ("unload")) { 3224 if (my $cb = $pkg->can ("unload")) {
2310 eval { 3225 eval {
… …
2315 3230
2316 warn "... nuking $pkg"; 3231 warn "... nuking $pkg";
2317 Symbol::delete_package $pkg; 3232 Symbol::delete_package $pkg;
2318 } 3233 }
2319 3234
2320 warn "unload all perl modules loaded from $LIBDIR"; 3235 warn "unloading all perl modules loaded from $LIBDIR";
2321 while (my ($k, $v) = each %INC) { 3236 while (my ($k, $v) = each %INC) {
2322 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3237 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2323 3238
2324 warn "removing <$k>"; 3239 warn "... unloading $k";
2325 delete $INC{$k}; 3240 delete $INC{$k};
2326 3241
2327 $k =~ s/\.pm$//; 3242 $k =~ s/\.pm$//;
2328 $k =~ s/\//::/g; 3243 $k =~ s/\//::/g;
2329 3244
… …
2332 } 3247 }
2333 3248
2334 Symbol::delete_package $k; 3249 Symbol::delete_package $k;
2335 } 3250 }
2336 3251
2337 warn "get rid of safe::, as good as possible"; 3252 warn "getting rid of safe::, as good as possible";
2338 Symbol::delete_package "safe::$_" 3253 Symbol::delete_package "safe::$_"
2339 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3254 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2340 3255
2341 warn "unload cf.pm \"a bit\""; 3256 warn "unloading cf.pm \"a bit\"";
2342 delete $INC{"cf.pm"}; 3257 delete $INC{"cf.pm"};
3258 delete $INC{"cf/pod.pm"};
2343 3259
2344 # don't, removes xs symbols, too, 3260 # don't, removes xs symbols, too,
2345 # and global variables created in xs 3261 # and global variables created in xs
2346 #Symbol::delete_package __PACKAGE__; 3262 #Symbol::delete_package __PACKAGE__;
2347 3263
3264 warn "unload completed, starting to reload now";
3265
2348 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
2349 require cf; 3267 require cf;
2350 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2351 3269
2352 warn "load config and database again"; 3270 warn "loading config and database again";
2353 cf::cfg_load; 3271 cf::reload_config;
2354 cf::db_load;
2355 3272
2356 warn "load extensions"; 3273 warn "loading extensions";
2357 cf::load_extensions; 3274 cf::load_extensions;
2358 3275
2359 warn "reattach attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";
2360 _global_reattach; 3277 _global_reattach; # objects, sockets
2361 warn "reattach attachments to maps"; 3278 warn "reattaching attachments to maps";
2362 reattach $_ for values %MAP; 3279 reattach $_ for values %MAP;
2363 }; 3280 warn "reattaching attachments to players";
3281 reattach $_ for values %PLAYER;
2364 3282
2365 if ($@) { 3283 warn "leaving sync_job";
3284
3285 1
3286 } or do {
2366 warn $@; 3287 warn $@;
2367 warn "error while reloading, exiting."; 3288 warn "error while reloading, exiting.";
2368 exit 1; 3289 exit 1;
2369 } 3290 };
2370 3291
2371 warn "reloaded"; 3292 warn "reloaded";
2372}; 3293};
2373 3294
3295our $RELOAD_WATCHER; # used only during reload
3296
3297sub reload_perl() {
3298 # doing reload synchronously and two reloads happen back-to-back,
3299 # coro crashes during coro_state_free->destroy here.
3300
3301 $RELOAD_WATCHER ||= Event->timer (
3302 reentrant => 0,
3303 after => 0,
3304 data => WF_AUTOCANCEL,
3305 cb => sub {
3306 do_reload_perl;
3307 undef $RELOAD_WATCHER;
3308 },
3309 );
3310}
3311
2374register_command "reload" => sub { 3312register_command "reload" => sub {
2375 my ($who, $arg) = @_; 3313 my ($who, $arg) = @_;
2376 3314
2377 if ($who->flag (FLAG_WIZ)) { 3315 if ($who->flag (FLAG_WIZ)) {
2378 $who->message ("start of reload.");
2379 reload;
2380 $who->message ("end of reload."); 3316 $who->message ("reloading server.");
3317 async { reload_perl };
2381 } 3318 }
2382}; 3319};
2383 3320
2384unshift @INC, $LIBDIR; 3321unshift @INC, $LIBDIR;
2385 3322
3323my $bug_warning = 0;
3324
3325our @WAIT_FOR_TICK;
3326our @WAIT_FOR_TICK_BEGIN;
3327
3328sub wait_for_tick {
3329 return unless $TICK_WATCHER->is_active;
3330 return if $Coro::current == $Coro::main;
3331
3332 my $signal = new Coro::Signal;
3333 push @WAIT_FOR_TICK, $signal;
3334 $signal->wait;
3335}
3336
3337sub wait_for_tick_begin {
3338 return unless $TICK_WATCHER->is_active;
3339 return if $Coro::current == $Coro::main;
3340
3341 my $signal = new Coro::Signal;
3342 push @WAIT_FOR_TICK_BEGIN, $signal;
3343 $signal->wait;
3344}
3345
3346 my $min = 1e6;#d#
3347 my $avg = 10;
2386$TICK_WATCHER = Event->timer ( 3348$TICK_WATCHER = Event->timer (
2387 reentrant => 0, 3349 reentrant => 0,
3350 parked => 1,
2388 prio => 0, 3351 prio => 0,
2389 at => $NEXT_TICK || $TICK, 3352 at => $NEXT_TICK || $TICK,
2390 data => WF_AUTOCANCEL, 3353 data => WF_AUTOCANCEL,
2391 cb => sub { 3354 cb => sub {
3355 if ($Coro::current != $Coro::main) {
3356 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3357 unless ++$bug_warning > 10;
3358 return;
3359 }
3360
2392 $NOW = Event::time; 3361 $NOW = $tick_start = Event::time;
2393 3362
2394 cf::server_tick; # one server iteration 3363 cf::server_tick; # one server iteration
3364
3365 0 && sync_job {#d#
3366 for(1..10) {
3367 my $t = Event::time;
3368 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3369 or die;
3370
3371 $map->width (50);
3372 $map->height (50);
3373 $map->alloc;
3374 $map->_load_objects ("/tmp/x.map", 1);
3375 my $t = Event::time - $t;
3376
3377 #next unless $t < 0.0013;#d#
3378 if ($t < $min) {
3379 $min = $t;
3380 }
3381 $avg = $avg * 0.99 + $t * 0.01;
3382 }
3383 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3384 exit 0;
3385 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3386 };
3387
2395 $RUNTIME += $TICK; 3388 $RUNTIME += $TICK;
2396 $NEXT_TICK += $TICK; 3389 $NEXT_TICK += $TICK;
2397 3390
2398 $WAIT_FOR_TICK->broadcast; 3391 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2399 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3392 $NEXT_RUNTIME_WRITE = $NOW + 10;
3393 Coro::async_pool {
3394 write_runtime
3395 or warn "ERROR: unable to write runtime file: $!";
3396 };
3397 }
3398
3399# my $AFTER = Event::time;
3400# warn $AFTER - $NOW;#d#
3401
3402 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3403 $sig->send;
3404 }
3405 while (my $sig = shift @WAIT_FOR_TICK) {
3406 $sig->send;
3407 }
3408
3409 $NOW = Event::time;
2400 3410
2401 # if we are delayed by four ticks or more, skip them all 3411 # if we are delayed by four ticks or more, skip them all
2402 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3412 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2403 3413
2404 $TICK_WATCHER->at ($NEXT_TICK); 3414 $TICK_WATCHER->at ($NEXT_TICK);
2405 $TICK_WATCHER->start; 3415 $TICK_WATCHER->start;
3416
3417 $LOAD = ($NOW - $tick_start) / $TICK;
3418 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3419
3420 _post_tick;
3421
3422
2406 }, 3423 },
2407); 3424);
2408 3425
3426{
3427 BDB::max_poll_time $TICK * 0.1;
3428 $BDB_POLL_WATCHER = Event->io (
3429 reentrant => 0,
3430 fd => BDB::poll_fileno,
3431 poll => 'r',
3432 prio => 0,
3433 data => WF_AUTOCANCEL,
3434 cb => \&BDB::poll_cb,
3435 );
3436 BDB::min_parallel 8;
3437
3438 BDB::set_sync_prepare {
3439 my $status;
3440 my $current = $Coro::current;
3441 (
3442 sub {
3443 $status = $!;
3444 $current->ready; undef $current;
3445 },
3446 sub {
3447 Coro::schedule while defined $current;
3448 $! = $status;
3449 },
3450 )
3451 };
3452
3453 unless ($DB_ENV) {
3454 $DB_ENV = BDB::db_env_create;
3455
3456 cf::sync_job {
3457 eval {
3458 BDB::db_env_open
3459 $DB_ENV,
3460 $BDBDIR,
3461 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3462 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3463 0666;
3464
3465 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3466
3467 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3468 $DB_ENV->set_lk_detect;
3469 };
3470
3471 cf::cleanup "db_env_open(db): $@" if $@;
3472 };
3473 }
3474}
3475
3476{
3477 IO::AIO::min_parallel 8;
3478
3479 undef $Coro::AIO::WATCHER;
2409IO::AIO::max_poll_time $TICK * 0.2; 3480 IO::AIO::max_poll_time $TICK * 0.1;
2410
2411$AIO_POLL_WATCHER = Event->io ( 3481 $AIO_POLL_WATCHER = Event->io (
2412 fd => IO::AIO::poll_fileno, 3482 reentrant => 0,
2413 poll => 'r',
2414 prio => 5,
2415 data => WF_AUTOCANCEL,
2416 cb => \&IO::AIO::poll_cb,
2417);
2418
2419$WRITE_RUNTIME_WATCHER = Event->timer (
2420 data => WF_AUTOCANCEL, 3483 data => WF_AUTOCANCEL,
2421 after => 0, 3484 fd => IO::AIO::poll_fileno,
2422 interval => 10, 3485 poll => 'r',
2423 cb => sub { 3486 prio => 6,
2424 (Coro::unblock_sub { 3487 cb => \&IO::AIO::poll_cb,
2425 write_runtime 3488 );
2426 or warn "ERROR: unable to write runtime file: $!"; 3489}
3490
3491my $_log_backtrace;
3492
3493sub _log_backtrace {
3494 my ($msg, @addr) = @_;
3495
3496 $msg =~ s/\n//;
3497
3498 # limit the # of concurrent backtraces
3499 if ($_log_backtrace < 2) {
3500 ++$_log_backtrace;
3501 async {
3502 my @bt = fork_call {
3503 @addr = map { sprintf "%x", $_ } @addr;
3504 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3505 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3506 or die "addr2line: $!";
3507
3508 my @funcs;
3509 my @res = <$fh>;
3510 chomp for @res;
3511 while (@res) {
3512 my ($func, $line) = splice @res, 0, 2, ();
3513 push @funcs, "[$func] $line";
3514 }
3515
3516 @funcs
3517 };
3518
3519 LOG llevInfo, "[ABT] $msg\n";
3520 LOG llevInfo, "[ABT] $_\n" for @bt;
3521 --$_log_backtrace;
2427 })->(); 3522 };
3523 } else {
3524 LOG llevInfo, "[ABT] $msg\n";
3525 LOG llevInfo, "[ABT] [suppressed]\n";
2428 }, 3526 }
2429); 3527}
3528
3529# load additional modules
3530use cf::pod;
2430 3531
2431END { cf::emergency_save } 3532END { cf::emergency_save }
2432 3533
24331 35341
2434 3535

Diff Legend

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