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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines