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.110 by root, Mon Jan 1 11:21:55 2007 UTC vs.
Revision 1.155 by root, Tue Jan 9 21:32:42 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
37our %EXTCMD = (); 38our %EXTCMD = ();
38 39
47our %CFG; 48our %CFG;
48 49
49our $UPTIME; $UPTIME ||= time; 50our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 51our $RUNTIME;
51 52
53our %PLAYER; # all users
52our %MAP; # all maps 54our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
58
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
57 61
58binmode STDOUT; 62binmode STDOUT;
59binmode STDERR; 63binmode STDERR;
60 64
61# read virtual server time, if available 65# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 75mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 76mkdir $RANDOM_MAPS;
73 77
74# a special map that is always available 78# a special map that is always available
75our $LINK_MAP; 79our $LINK_MAP;
76 80our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 81
79############################################################################# 82#############################################################################
80 83
81=head2 GLOBAL VARIABLES 84=head2 GLOBAL VARIABLES
82 85
106 109
107=item %cf::CFG 110=item %cf::CFG
108 111
109Configuration for the server, loaded from C</etc/crossfire/config>, or 112Configuration for the server, loaded from C</etc/crossfire/config>, or
110from wherever your confdir points to. 113from wherever your confdir points to.
114
115=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
116
117These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
118or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
119processing has been done. Call C<< ->wait >> on them to maximise the
120window of cpu time available, or simply to synchronise to the server tick.
111 121
112=back 122=back
113 123
114=cut 124=cut
115 125
119 utf8::encode $msg; 129 utf8::encode $msg;
120 130
121 $msg .= "\n" 131 $msg .= "\n"
122 unless $msg =~ /\n$/; 132 unless $msg =~ /\n$/;
123 133
124 LOG llevError, "cfperl: $msg"; 134 LOG llevError, $msg;
125 }; 135 };
126} 136}
127 137
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 138@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 139@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
155 165
156=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
157 167
158=over 4 168=over 4
159 169
170=item dumpval $ref
171
160=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
161 192
162use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
163 194
164=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
165 196
180 211
181sub to_json($) { 212sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 214 JSON::Syck::Dump $_[0]
184} 215}
216
217=item cf::lock_wait $string
218
219Wait until the given lock is available. See cf::lock_acquire.
220
221=item my $lock = cf::lock_acquire $string
222
223Wait until the given lock is available and then acquires it and returns
224a Coro::guard object. If the guard object gets destroyed (goes out of scope,
225for example when the coroutine gets canceled), the lock is automatically
226returned.
227
228Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load).
230
231=cut
232
233our %LOCK;
234
235sub lock_wait($) {
236 my ($key) = @_;
237
238 # wait for lock, if any
239 while ($LOCK{$key}) {
240 push @{ $LOCK{$key} }, $Coro::current;
241 Coro::schedule;
242 }
243}
244
245sub lock_acquire($) {
246 my ($key) = @_;
247
248 # wait, to be sure we are not locked
249 lock_wait $key;
250
251 $LOCK{$key} = [];
252
253 Coro::guard {
254 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} };
256 }
257}
258
259sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active;
261
262 my $guard = Coro::guard { $TICK_WATCHER->start };
263 $TICK_WATCHER->stop;
264 $guard
265}
266
267=item cf::async { BLOCK }
268
269Currently the same as Coro::async_pool, meaning you cannot use
270C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
271thing you are allowed to do is call C<prio> on it.
272
273=cut
274
275BEGIN { *async = \&Coro::async_pool }
185 276
186=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
187 278
188The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
197=cut 288=cut
198 289
199sub sync_job(&) { 290sub sync_job(&) {
200 my ($job) = @_; 291 my ($job) = @_;
201 292
202 my $busy = 1;
203 my @res;
204
205 my $coro = Coro::async {
206 @res = eval { $job->() };
207 warn $@ if $@;
208 undef $busy;
209 };
210
211 if ($Coro::current == $Coro::main) { 293 if ($Coro::current == $Coro::main) {
294 # this is the main coro, too bad, we have to block
295 # till the operation succeeds, freezing the server :/
296
212 # TODO: use suspend/resume instead 297 # TODO: use suspend/resume instead
213 local $FREEZE = 1; 298 # (but this is cancel-safe)
299 my $freeze_guard = freeze_mainloop;
300
301 my $busy = 1;
302 my @res;
303
304 (async {
305 @res = eval { $job->() };
306 warn $@ if $@;
307 undef $busy;
214 $coro->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
309
215 while ($busy) { 310 while ($busy) {
216 Coro::cede_notself; 311 Coro::cede or Event::one_event;
217 Event::one_event unless Coro::nready;
218 } 312 }
313
314 wantarray ? @res : $res[0]
219 } else { 315 } else {
220 $coro->join; 316 # we are in another coroutine, how wonderful, everything just works
317
318 $job->()
221 } 319 }
222
223 wantarray ? @res : $res[0]
224} 320}
225 321
226=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
227 323
228Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automcatially being canceled when the
229when the extension calling this is being unloaded. 325extension calling this is being unloaded.
230 326
231=cut 327=cut
232 328
233sub coro(&) { 329sub async_ext(&) {
234 my $cb = shift; 330 my $cb = shift;
235 331
236 my $coro; $coro = async { 332 my $coro = &Coro::async ($cb);
237 eval {
238 $cb->();
239 };
240 warn $@ if $@;
241 };
242 333
243 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
244 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
245 }); 336 });
246 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
252 my $runtime = cf::localdir . "/runtime"; 343 my $runtime = cf::localdir . "/runtime";
253 344
254 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 345 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
255 or return; 346 or return;
256 347
257 my $value = $cf::RUNTIME; 348 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock
258 (aio_write $fh, 0, (length $value), $value, 0) <= 0 349 (aio_write $fh, 0, (length $value), $value, 0) <= 0
259 and return; 350 and return;
260 351
261 aio_fsync $fh 352 aio_fsync $fh
262 and return; 353 and return;
276 367
277############################################################################# 368#############################################################################
278 369
279package cf::path; 370package cf::path;
280 371
372# used to convert map paths into valid unix filenames by repalcing / by ∕
373our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
374
281sub new { 375sub new {
282 my ($class, $path, $base) = @_; 376 my ($class, $path, $base) = @_;
283 377
284 $path = $path->as_string if ref $path; 378 $path = $path->as_string if ref $path;
285 379
286 my $self = bless { }, $class; 380 my $self = bless { }, $class;
287 381
382 # {... are special paths that are not touched
383 # ?xxx/... are special absolute paths
384 # ?random/... random maps
385 # /! non-realised random map exit
386 # /... normal maps
387 # ~/... per-player maps without a specific player (DO NOT USE)
388 # ~user/... per-player map of a specific user
389
390 if ($path =~ /^{/) {
391 # fine as it is
288 if ($path =~ s{^\?random/}{}) { 392 } elsif ($path =~ s{^\?random/}{}) {
289 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 393 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
290 $self->{random} = cf::from_json $data; 394 $self->{random} = cf::from_json $data;
291 } else { 395 } else {
292 if ($path =~ s{^~([^/]+)?}{}) { 396 if ($path =~ s{^~([^/]+)?}{}) {
293 $self->{user_rel} = 1; 397 $self->{user_rel} = 1;
338# } 442# }
339} 443}
340 444
341# escape the /'s in the path 445# escape the /'s in the path
342sub _escaped_path { 446sub _escaped_path {
343 # ∕ is U+2215
344 (my $path = $_[0]{path}) =~ s/\///g; 447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
345 $path 448 $path
346} 449}
347 450
348# the original (read-only) location 451# the original (read-only) location
349sub load_path { 452sub load_path {
798 or return; 901 or return;
799 902
800 unless (aio_stat "$filename.pst") { 903 unless (aio_stat "$filename.pst") {
801 (aio_load "$filename.pst", $av) >= 0 904 (aio_load "$filename.pst", $av) >= 0
802 or return; 905 or return;
803 $av = eval { (Storable::thaw <$av>)->{objs} }; 906 $av = eval { (Storable::thaw $av)->{objs} };
804 } 907 }
805 908
909 warn sprintf "loading %s (%d)\n",
910 $filename, length $data, scalar @{$av || []};#d#
806 return ($data, $av); 911 return ($data, $av);
807} 912}
808 913
809############################################################################# 914#############################################################################
810# command handling &c 915# command handling &c
974}; 1079};
975 1080
976cf::map->attach (prio => -10000, package => cf::mapsupport::); 1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
977 1082
978############################################################################# 1083#############################################################################
979# load/save perl data associated with player->ob objects
980
981sub all_objects(@) {
982 @_, map all_objects ($_->inv), @_
983}
984
985# TODO: compatibility cruft, remove when no longer needed
986cf::player->attach (
987 on_load => sub {
988 my ($pl, $path) = @_;
989
990 for my $o (all_objects $pl->ob) {
991 if (my $value = $o->get_ob_key_value ("_perl_data")) {
992 $o->set_ob_key_value ("_perl_data");
993
994 %$o = %{ Storable::thaw pack "H*", $value };
995 }
996 }
997 },
998);
999
1000#############################################################################
1001 1084
1002=head2 CORE EXTENSIONS 1085=head2 CORE EXTENSIONS
1003 1086
1004Functions and methods that extend core crossfire objects. 1087Functions and methods that extend core crossfire objects.
1005 1088
1089=cut
1090
1091package cf::player;
1092
1093use Coro::AIO;
1094
1006=head3 cf::player 1095=head3 cf::player
1007 1096
1008=over 4 1097=over 4
1009 1098
1010=item cf::player::exists $login 1099=item cf::player::find $login
1011 1100
1012Returns true when the given account exists. 1101Returns the given player object, loading it if necessary (might block).
1013 1102
1014=cut 1103=cut
1015 1104
1016sub cf::player::exists($) { 1105sub playerdir($) {
1017 cf::player::find $_[0] 1106 cf::localdir
1018 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1107 . "/"
1108 . cf::playerdir
1109 . "/"
1110 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1111}
1112
1113sub path($) {
1114 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1115
1116 (playerdir $login) . "/$login.pl"
1117}
1118
1119sub find_active($) {
1120 $cf::PLAYER{$_[0]}
1121 and $cf::PLAYER{$_[0]}->active
1122 and $cf::PLAYER{$_[0]}
1123}
1124
1125sub exists($) {
1126 my ($login) = @_;
1127
1128 $cf::PLAYER{$login}
1129 or cf::sync_job { !aio_stat $login }
1130}
1131
1132sub find($) {
1133 return $cf::PLAYER{$_[0]} || do {
1134 my $login = $_[0];
1135
1136 my $guard = cf::lock_acquire "user_find:$login";
1137
1138 $cf::PLAYER{$_[0]} || do {
1139 my $pl = load_pl path $login
1140 or return;
1141 $cf::PLAYER{$login} = $pl
1142 }
1143 }
1144}
1145
1146sub save($) {
1147 my ($pl) = @_;
1148
1149 return if $pl->{deny_save};
1150
1151 my $path = path $pl;
1152 my $guard = cf::lock_acquire "user_save:$path";
1153
1154 return if $pl->{deny_save};
1155
1156 aio_mkdir playerdir $pl, 0770;
1157 $pl->{last_save} = $cf::RUNTIME;
1158
1159 $pl->save_pl ($path);
1160 Coro::cede;
1161}
1162
1163sub new($) {
1164 my ($login) = @_;
1165
1166 my $self = create;
1167
1168 $self->ob->name ($login);
1169 $self->{deny_save} = 1;
1170
1171 $cf::PLAYER{$login} = $self;
1172
1173 $self
1174}
1175
1176=item $pl->quit_character
1177
1178Nukes the player without looking back. If logged in, the connection will
1179be destroyed. May block for a long time.
1180
1181=cut
1182
1183sub quit_character {
1184 my ($pl) = @_;
1185
1186 $pl->{deny_save} = 1;
1187 $pl->password ("*"); # this should lock out the player until we nuked the dir
1188
1189 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1190 $pl->deactivate;
1191 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1192 $pl->ns->destroy if $pl->ns;
1193
1194 my $path = playerdir $pl;
1195 my $temp = "$path~$cf::RUNTIME~deleting~";
1196 aio_rename $path, $temp;
1197 delete $cf::PLAYER{$pl->ob->name};
1198 $pl->destroy;
1199 IO::AIO::aio_rmtree $temp;
1200}
1201
1202=item cf::player::list_logins
1203
1204Returns am arrayref of all valid playernames in the system, can take a
1205while and may block, so not sync_job-capable, ever.
1206
1207=cut
1208
1209sub list_logins {
1210 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1211 or return [];
1212
1213 my @logins;
1214
1215 for my $login (@$dirs) {
1216 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1217 aio_read $fh, 0, 512, my $buf, 0 or next;
1218 $buf !~ /^password -------------$/m or next; # official not-valid tag
1219
1220 utf8::decode $login;
1221 push @logins, $login;
1222 }
1223
1224 \@logins
1225}
1226
1227=item $player->maps
1228
1229Returns an arrayref of cf::path's of all maps that are private for this
1230player. May block.
1231
1232=cut
1233
1234sub maps($) {
1235 my ($pl) = @_;
1236
1237 my $files = aio_readdir playerdir $pl
1238 or return;
1239
1240 my @paths;
1241
1242 for (@$files) {
1243 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/;
1246
1247 s/$PATH_SEP/\//g;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 }
1250
1251 \@paths
1019} 1252}
1020 1253
1021=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1022 1255
1023Sends an ext reply to the player. 1256Sends an ext reply to the player.
1024 1257
1025=cut 1258=cut
1026 1259
1027sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1028 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1029 1262
1030 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1031 1264
1032 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1033} 1266}
1267
1268package cf;
1034 1269
1035=back 1270=back
1036 1271
1037 1272
1038=head3 cf::map 1273=head3 cf::map
1044package cf::map; 1279package cf::map;
1045 1280
1046use Fcntl; 1281use Fcntl;
1047use Coro::AIO; 1282use Coro::AIO;
1048 1283
1049our $MAX_RESET = 7200; 1284our $MAX_RESET = 3600;
1050our $DEFAULT_RESET = 3600; 1285our $DEFAULT_RESET = 3000;
1051$MAX_RESET = 10;#d#
1052$DEFAULT_RESET = 10;#d#
1053 1286
1054sub generate_random_map { 1287sub generate_random_map {
1055 my ($path, $rmp) = @_; 1288 my ($path, $rmp) = @_;
1056 1289
1057 # mit "rum" bekleckern, nicht 1290 # mit "rum" bekleckern, nicht
1073# and all this just because we cannot iterate over 1306# and all this just because we cannot iterate over
1074# all maps in C++... 1307# all maps in C++...
1075sub change_all_map_light { 1308sub change_all_map_light {
1076 my ($change) = @_; 1309 my ($change) = @_;
1077 1310
1078 $_->change_map_light ($change) for values %cf::MAP; 1311 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP;
1079} 1313}
1080 1314
1081sub try_load_header($) { 1315sub try_load_header($) {
1082 my ($path) = @_; 1316 my ($path) = @_;
1083 1317
1086 or return; 1320 or return;
1087 1321
1088 my $map = cf::map::new 1322 my $map = cf::map::new
1089 or return; 1323 or return;
1090 1324
1325 # for better error messages only, will be overwritten
1326 $map->path ($path);
1327
1091 $map->load_header ($path) 1328 $map->load_header ($path)
1092 or return; 1329 or return;
1093 1330
1094 $map->{load_path} = $path; 1331 $map->{load_path} = $path;
1095 use Data::Dumper; warn Dumper $map;#d#
1096 1332
1097 $map 1333 $map
1098} 1334}
1099 1335
1336sub find;
1100sub find_map { 1337sub find {
1101 my ($path, $origin) = @_; 1338 my ($path, $origin) = @_;
1102 1339
1103 #warn "find_map<$path,$origin>\n";#d# 1340 #warn "find<$path,$origin>\n";#d#
1104 1341
1105 $path = ref $path ? $path : new cf::path $path, $origin && $origin->path; 1342 $path = new cf::path $path, $origin && $origin->path;
1106 my $key = $path->as_string; 1343 my $key = $path->as_string;
1107 1344
1345 cf::lock_wait "map_find:$key";
1346
1108 $cf::MAP{$key} || do { 1347 $cf::MAP{$key} || do {
1348 my $guard = cf::lock_acquire "map_find:$key";
1349
1109 # do it the slow way 1350 # do it the slow way
1110 my $map = try_load_header $path->save_path; 1351 my $map = try_load_header $path->save_path;
1111 1352
1353 Coro::cede;
1354
1112 if ($map) { 1355 if ($map) {
1356 $map->last_access ((delete $map->{last_access})
1357 || $cf::RUNTIME); #d#
1113 # safety 1358 # safety
1114 $map->{instantiate_time} = $cf::RUNTIME 1359 $map->{instantiate_time} = $cf::RUNTIME
1115 if $map->{instantiate_time} > $cf::RUNTIME; 1360 if $map->{instantiate_time} > $cf::RUNTIME;
1116 } else { 1361 } else {
1117 if (my $rmp = $path->random_map_params) { 1362 if (my $rmp = $path->random_map_params) {
1120 $map = try_load_header $path->load_path; 1365 $map = try_load_header $path->load_path;
1121 } 1366 }
1122 1367
1123 $map or return; 1368 $map or return;
1124 1369
1370 $map->{load_original} = 1;
1125 $map->{instantiate_time} = $cf::RUNTIME; 1371 $map->{instantiate_time} = $cf::RUNTIME;
1372 $map->last_access ($cf::RUNTIME);
1126 $map->instantiate; 1373 $map->instantiate;
1127 1374
1128 # per-player maps become, after loading, normal maps 1375 # per-player maps become, after loading, normal maps
1129 $map->per_player (0) if $path->{user_rel}; 1376 $map->per_player (0) if $path->{user_rel};
1130 } 1377 }
1131 1378
1132 $map->path ($key); 1379 $map->path ($key);
1133 $map->{path} = $path; 1380 $map->{path} = $path;
1134 $map->last_access ($cf::RUNTIME); 1381 $map->{last_save} = $cf::RUNTIME;
1135 1382
1383 Coro::cede;
1384
1136 $map->reset if $map->should_reset; 1385 if ($map->should_reset) {
1386 $map->reset;
1387 undef $guard;
1388 $map = find $path
1389 or return;
1390 }
1137 1391
1138 $cf::MAP{$key} = $map 1392 $cf::MAP{$key} = $map
1139 } 1393 }
1140} 1394}
1141 1395
1142sub load { 1396sub load {
1143 my ($self) = @_; 1397 my ($self) = @_;
1144 1398
1399 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1401
1145 return if $self->in_memory != cf::MAP_SWAPPED; 1402 return if $self->in_memory != cf::MAP_SWAPPED;
1146 1403
1147 $self->in_memory (cf::MAP_LOADING); 1404 $self->in_memory (cf::MAP_LOADING);
1148
1149 my $path = $self->{path};
1150 1405
1151 $self->alloc; 1406 $self->alloc;
1152 $self->load_objects ($self->{load_path}, 1) 1407 $self->load_objects ($self->{load_path}, 1)
1153 or return; 1408 or return;
1409
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original};
1154 1412
1155 if (my $uniq = $path->uniq_path) { 1413 if (my $uniq = $path->uniq_path) {
1156 utf8::encode $uniq; 1414 utf8::encode $uniq;
1157 if (aio_open $uniq, O_RDONLY, 0) { 1415 if (aio_open $uniq, O_RDONLY, 0) {
1158 $self->clear_unique_items; 1416 $self->clear_unique_items;
1159 $self->load_objects ($uniq, 0); 1417 $self->load_objects ($uniq, 0);
1160 } 1418 }
1161 } 1419 }
1420
1421 Coro::cede;
1162 1422
1163 # now do the right thing for maps 1423 # now do the right thing for maps
1164 $self->link_multipart_objects; 1424 $self->link_multipart_objects;
1165 1425
1166 if ($self->{path}->is_style_map) { 1426 if ($self->{path}->is_style_map) {
1174 $self->difficulty ($self->estimate_difficulty) 1434 $self->difficulty ($self->estimate_difficulty)
1175 unless $self->difficulty; 1435 unless $self->difficulty;
1176 $self->activate; 1436 $self->activate;
1177 } 1437 }
1178 1438
1439 Coro::cede;
1440
1179 $self->in_memory (cf::MAP_IN_MEMORY); 1441 $self->in_memory (cf::MAP_IN_MEMORY);
1180} 1442}
1181 1443
1182sub load_map_sync { 1444sub find_sync {
1183 my ($path, $origin) = @_; 1445 my ($path, $origin) = @_;
1184 1446
1185 #warn "load_map_sync<$path, $origin>\n";#d# 1447 cf::sync_job { cf::map::find $path, $origin }
1448}
1186 1449
1187 cf::sync_job { 1450sub do_load_sync {
1188 my $map = cf::map::find_map $path, $origin 1451 my ($map) = @_;
1189 or return; 1452
1190 $map->load; 1453 cf::sync_job { $map->load };
1191 $map
1192 }
1193} 1454}
1194 1455
1195sub save { 1456sub save {
1196 my ($self) = @_; 1457 my ($self) = @_;
1197 1458
1459 my $lock = cf::lock_acquire "map_data:" . $self->path;
1460
1461 $self->{last_save} = $cf::RUNTIME;
1462
1463 return unless $self->dirty;
1464
1198 my $save = $self->{path}->save_path; utf8::encode $save; 1465 my $save = $self->{path}->save_path; utf8::encode $save;
1199 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1466 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1200 1467
1201 $self->{last_save} = $cf::RUNTIME;
1202
1203 return unless $self->dirty;
1204
1205 $self->{load_path} = $save; 1468 $self->{load_path} = $save;
1206 1469
1207 return if $self->{deny_save}; 1470 return if $self->{deny_save};
1208 1471
1209 warn "saving map ", $self->path; 1472 local $self->{last_access} = $self->last_access;#d#
1473
1474 cf::async {
1475 $_->contr->save for $self->players;
1476 };
1210 1477
1211 if ($uniq) { 1478 if ($uniq) {
1212 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1479 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1213 $self->save_objects ($uniq, cf::IO_UNIQUES); 1480 $self->save_objects ($uniq, cf::IO_UNIQUES);
1214 } else { 1481 } else {
1217} 1484}
1218 1485
1219sub swap_out { 1486sub swap_out {
1220 my ($self) = @_; 1487 my ($self) = @_;
1221 1488
1489 # save first because save cedes
1490 $self->save;
1491
1492 my $lock = cf::lock_acquire "map_data:" . $self->path;
1493
1222 return if $self->players; 1494 return if $self->players;
1223 return if $self->in_memory != cf::MAP_IN_MEMORY; 1495 return if $self->in_memory != cf::MAP_IN_MEMORY;
1224 return if $self->{deny_save}; 1496 return if $self->{deny_save};
1225 1497
1226 $self->save;
1227 $self->clear; 1498 $self->clear;
1228 $self->in_memory (cf::MAP_SWAPPED); 1499 $self->in_memory (cf::MAP_SWAPPED);
1229} 1500}
1230 1501
1502sub reset_at {
1503 my ($self) = @_;
1504
1505 # TODO: safety, remove and allow resettable per-player maps
1506 return 1e99 if $self->{path}{user_rel};
1507 return 1e99 if $self->{deny_reset};
1508
1509 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1510 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1511
1512 $time + $to
1513}
1514
1231sub should_reset { 1515sub should_reset {
1232 my ($map) = @_;
1233
1234 # TODO: safety, remove and allow resettable per-player maps
1235 return if $map->{path}{user_rel};#d#
1236 return if $map->{deny_reset};
1237 #return unless $map->reset_timeout;
1238
1239 my $time = $map->fixed_resettime ? $map->{instantiate_time} : $map->last_access;
1240
1241 $time + ($map->reset_timeout || $DEFAULT_RESET) < $cf::RUNTIME
1242}
1243
1244sub reset {
1245 my ($self) = @_; 1516 my ($self) = @_;
1246 1517
1247 return if $self->players; 1518 $self->reset_at <= $cf::RUNTIME
1248 return if $self->{path}{user_rel};#d# 1519}
1249 1520
1250 warn "resetting map ", $self->path;#d# 1521sub unlink_save {
1522 my ($self) = @_;
1251 1523
1252 utf8::encode (my $save = $self->{path}->save_path); 1524 utf8::encode (my $save = $self->{path}->save_path);
1253 aioreq_pri 3; IO::AIO::aio_unlink $save; 1525 aioreq_pri 3; IO::AIO::aio_unlink $save;
1254 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst"; 1526 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1527}
1528
1529sub rename {
1530 my ($self, $new_path) = @_;
1531
1532 $self->unlink_save;
1533
1534 delete $cf::MAP{$self->path};
1535 $self->{path} = new cf::path $new_path;
1536 $self->path ($self->{path}->as_string);
1537 $cf::MAP{$self->path} = $self;
1538
1539 $self->save;
1540}
1541
1542sub reset {
1543 my ($self) = @_;
1544
1545 my $lock = cf::lock_acquire "map_data:" . $self->path;
1546
1547 return if $self->players;
1548 return if $self->{path}{user_rel};#d#
1549
1550 warn "resetting map ", $self->path;#d#
1551
1552 delete $cf::MAP{$self->path};
1255 1553
1256 $_->clear_links_to ($self) for values %cf::MAP; 1554 $_->clear_links_to ($self) for values %cf::MAP;
1257 1555
1556 $self->unlink_save;
1258 $self->clear; 1557 $self->destroy;
1259 $self->in_memory (cf::MAP_SWAPPED); 1558}
1260 utf8::encode ($self->{load_path} = $self->{path}->load_path); 1559
1560my $nuke_counter = "aaaa";
1561
1562sub nuke {
1563 my ($self) = @_;
1564
1565 $self->{deny_save} = 1;
1566 $self->reset_timeout (1);
1567 $self->rename ("{nuke}/" . ($nuke_counter++));
1568 $self->reset; # polite request, might not happen
1261} 1569}
1262 1570
1263sub customise_for { 1571sub customise_for {
1264 my ($map, $ob) = @_; 1572 my ($map, $ob) = @_;
1265 1573
1266 if ($map->per_player) { 1574 if ($map->per_player) {
1267 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1575 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1268 } 1576 }
1269 1577
1270 $map 1578 $map
1271} 1579}
1272 1580
1273sub emergency_save {
1274 local $cf::FREEZE = 1;
1275
1276 warn "enter emergency map save\n";
1277
1278 cf::sync_job {
1279 warn "begin emergency map save\n";
1280 $_->save for values %cf::MAP;
1281 };
1282
1283 warn "end emergency map save\n";
1284}
1285
1286package cf; 1581package cf;
1287 1582
1288=back 1583=back
1289 1584
1585=head3 cf::object
1586
1587=cut
1588
1589package cf::object;
1590
1591=over 4
1592
1593=item $ob->inv_recursive
1594
1595Returns the inventory of the object _and_ their inventories, recursively.
1596
1597=cut
1598
1599sub inv_recursive_;
1600sub inv_recursive_ {
1601 map { $_, inv_recursive_ $_->inv } @_
1602}
1603
1604sub inv_recursive {
1605 inv_recursive_ inv $_[0]
1606}
1607
1608package cf;
1609
1610=back
1290 1611
1291=head3 cf::object::player 1612=head3 cf::object::player
1292 1613
1293=over 4 1614=over 4
1294 1615
1330 (ref $cf::CFG{"may_$access"} 1651 (ref $cf::CFG{"may_$access"}
1331 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1652 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1332 : $cf::CFG{"may_$access"}) 1653 : $cf::CFG{"may_$access"})
1333} 1654}
1334 1655
1656=item $player_object->enter_link
1657
1658Freezes the player and moves him/her to a special map (C<{link}>).
1659
1660The player should be reaosnably safe there for short amounts of time. You
1661I<MUST> call C<leave_link> as soon as possible, though.
1662
1663=item $player_object->leave_link ($map, $x, $y)
1664
1665Moves the player out of the specila link map onto the given map. If the
1666map is not valid (or omitted), the player will be moved back to the
1667location he/she was before the call to C<enter_link>, or, if that fails,
1668to the emergency map position.
1669
1670Might block.
1671
1672=cut
1673
1335sub cf::object::player::enter_link { 1674sub cf::object::player::enter_link {
1336 my ($self) = @_; 1675 my ($self) = @_;
1337 1676
1677 $self->deactivate_recursive;
1678
1338 return if $self->map == $LINK_MAP; 1679 return if $self->map == $LINK_MAP;
1339 1680
1340 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1341 if $self->map; 1682 if $self->map;
1342 1683
1343 $self->enter_map ($LINK_MAP, 20, 20); 1684 $self->enter_map ($LINK_MAP, 20, 20);
1344 $self->deactivate_recursive;
1345} 1685}
1346 1686
1347sub cf::object::player::leave_link { 1687sub cf::object::player::leave_link {
1348 my ($self, $map, $x, $y) = @_; 1688 my ($self, $map, $x, $y) = @_;
1349 1689
1350 my $link_pos = delete $self->{_link_pos}; 1690 my $link_pos = delete $self->{_link_pos};
1351 1691
1352 unless ($map) { 1692 unless ($map) {
1353 $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1354
1355 # restore original map position 1693 # restore original map position
1356 ($map, $x, $y) = @{ $link_pos || [] }; 1694 ($map, $x, $y) = @{ $link_pos || [] };
1357 $map = cf::map::find_map $map; 1695 $map = cf::map::find $map;
1358 1696
1359 unless ($map) { 1697 unless ($map) {
1360 ($map, $x, $y) = @$EMERGENCY_POSITION; 1698 ($map, $x, $y) = @$EMERGENCY_POSITION;
1361 $map = cf::map::find_map $map 1699 $map = cf::map::find $map
1362 or die "FATAL: cannot load emergency map\n"; 1700 or die "FATAL: cannot load emergency map\n";
1363 } 1701 }
1364 } 1702 }
1365 1703
1366 ($x, $y) = (-1, -1) 1704 ($x, $y) = (-1, -1)
1370 ($x, $y) = ($map->enter_x, $map->enter_y) 1708 ($x, $y) = ($map->enter_x, $map->enter_y)
1371 if $x <=0 && $y <= 0; 1709 if $x <=0 && $y <= 0;
1372 1710
1373 $map->load; 1711 $map->load;
1374 1712
1713 return unless $self->contr->active;
1375 $self->activate_recursive; 1714 $self->activate_recursive;
1376 $self->enter_map ($map, $x, $y); 1715 $self->enter_map ($map, $x, $y);
1377} 1716}
1378 1717
1718cf::player->attach (
1719 on_logout => sub {
1720 my ($pl) = @_;
1721
1722 # abort map switching before logout
1723 if ($pl->ob->{_link_pos}) {
1724 cf::sync_job {
1725 $pl->ob->leave_link
1726 };
1727 }
1728 },
1729 on_login => sub {
1730 my ($pl) = @_;
1731
1732 # try to abort aborted map switching on player login :)
1733 # should happen only on crashes
1734 if ($pl->ob->{_link_pos}) {
1735 $pl->ob->enter_link;
1736 (async {
1737 # we need this sleep as the login has a concurrent enter_exit running
1738 # and this sleep increases chances of the player not ending up in scorn
1739 $pl->ob->reply (undef,
1740 "There was an internal problem at your last logout, "
1741 . "the server will try to bring you to your intended destination in a second.",
1742 cf::NDI_RED);
1743 Coro::Timer::sleep 1;
1744 $pl->ob->leave_link;
1745 })->prio (2);
1746 }
1747 },
1748);
1749
1379=item $player_object->goto_map ($map, $x, $y) 1750=item $player_object->goto ($path, $x, $y)
1380 1751
1381=cut 1752=cut
1382 1753
1383sub cf::object::player::goto_map { 1754sub cf::object::player::goto {
1384 my ($self, $path, $x, $y) = @_; 1755 my ($self, $path, $x, $y) = @_;
1385 1756
1757 $path = new cf::path $path;
1758 $path ne "/" or Carp::cluck ("oy");#d#
1759
1386 $self->enter_link; 1760 $self->enter_link;
1387 1761
1388 (Coro::async { 1762 (async {
1389 $path = new cf::path $path;
1390
1391 my $map = cf::map::find_map $path->as_string; 1763 my $map = cf::map::find $path->as_string;
1392 $map = $map->customise_for ($self) if $map; 1764 $map = $map->customise_for ($self) if $map;
1393 1765
1394 warn "entering ", $map->path, " at ($x, $y)\n" 1766# warn "entering ", $map->path, " at ($x, $y)\n"
1395 if $map; 1767# if $map;
1768
1769 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1396 1770
1397 $self->leave_link ($map, $x, $y); 1771 $self->leave_link ($map, $x, $y);
1398 })->prio (1); 1772 })->prio (1);
1399} 1773}
1400 1774
1453 1827
1454 return unless $self->type == cf::PLAYER; 1828 return unless $self->type == cf::PLAYER;
1455 1829
1456 $self->enter_link; 1830 $self->enter_link;
1457 1831
1458 (Coro::async { 1832 (async {
1833 $self->deactivate_recursive; # just to be sure
1459 unless (eval { 1834 unless (eval {
1460
1461 prepare_random_map $exit 1835 prepare_random_map $exit
1462 if $exit->slaying eq "/!"; 1836 if $exit->slaying eq "/!";
1463 1837
1464 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1838 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1465 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1839 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1466 1840
1467 1; 1841 1;
1468 }) { 1842 }) {
1469 $self->message ("Something went wrong deep within the crossfire server. " 1843 $self->message ("Something went wrong deep within the crossfire server. "
1470 . "I'll try to bring you back to the map you were before. " 1844 . "I'll try to bring you back to the map you were before. "
1527 on_reply => sub { 1901 on_reply => sub {
1528 my ($ns, $msg) = @_; 1902 my ($ns, $msg) = @_;
1529 1903
1530 # this weird shuffling is so that direct followup queries 1904 # this weird shuffling is so that direct followup queries
1531 # get handled first 1905 # get handled first
1532 my $queue = delete $ns->{query_queue}; 1906 my $queue = delete $ns->{query_queue}
1907 or return; # be conservative, not sure how that can happen, but we saw a crash here
1533 1908
1534 (shift @$queue)->[1]->($msg); 1909 (shift @$queue)->[1]->($msg);
1535 1910
1536 push @{ $ns->{query_queue} }, @$queue; 1911 push @{ $ns->{query_queue} }, @$queue;
1537 1912
1543 } 1918 }
1544 } 1919 }
1545 }, 1920 },
1546); 1921);
1547 1922
1548=item $client->coro (\&cb) 1923=item $client->async (\&cb)
1549 1924
1550Create a new coroutine, running the specified callback. The coroutine will 1925Create a new coroutine, running the specified callback. The coroutine will
1551be automatically cancelled when the client gets destroyed (e.g. on logout, 1926be automatically cancelled when the client gets destroyed (e.g. on logout,
1552or loss of connection). 1927or loss of connection).
1553 1928
1554=cut 1929=cut
1555 1930
1556sub cf::client::coro { 1931sub cf::client::async {
1557 my ($self, $cb) = @_; 1932 my ($self, $cb) = @_;
1558 1933
1559 my $coro; $coro = async { 1934 my $coro = &Coro::async ($cb);
1560 eval {
1561 $cb->();
1562 };
1563 warn $@ if $@;
1564 };
1565 1935
1566 $coro->on_destroy (sub { 1936 $coro->on_destroy (sub {
1567 delete $self->{_coro}{$coro+0}; 1937 delete $self->{_coro}{$coro+0};
1568 }); 1938 });
1569 1939
1741 2111
1742{ 2112{
1743 my $path = cf::localdir . "/database.pst"; 2113 my $path = cf::localdir . "/database.pst";
1744 2114
1745 sub db_load() { 2115 sub db_load() {
1746 warn "loading database $path\n";#d# remove later
1747 $DB = stat $path ? Storable::retrieve $path : { }; 2116 $DB = stat $path ? Storable::retrieve $path : { };
1748 } 2117 }
1749 2118
1750 my $pid; 2119 my $pid;
1751 2120
1752 sub db_save() { 2121 sub db_save() {
1753 warn "saving database $path\n";#d# remove later
1754 waitpid $pid, 0 if $pid; 2122 waitpid $pid, 0 if $pid;
1755 if (0 == ($pid = fork)) { 2123 if (0 == ($pid = fork)) {
1756 $DB->{_meta}{version} = 1; 2124 $DB->{_meta}{version} = 1;
1757 Storable::nstore $DB, "$path~"; 2125 Storable::nstore $DB, "$path~";
1758 rename "$path~", $path; 2126 rename "$path~", $path;
1806 open my $fh, "<:utf8", cf::confdir . "/config" 2174 open my $fh, "<:utf8", cf::confdir . "/config"
1807 or return; 2175 or return;
1808 2176
1809 local $/; 2177 local $/;
1810 *CFG = YAML::Syck::Load <$fh>; 2178 *CFG = YAML::Syck::Load <$fh>;
2179
2180 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2181
2182 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2183 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2184
2185 if (exists $CFG{mlockall}) {
2186 eval {
2187 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2188 and die "WARNING: m(un)lockall failed: $!\n";
2189 };
2190 warn $@ if $@;
2191 }
1811} 2192}
1812 2193
1813sub main { 2194sub main {
1814 # we must not ever block the main coroutine 2195 # we must not ever block the main coroutine
1815 local $Coro::idle = sub { 2196 local $Coro::idle = sub {
1816 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1817 (Coro::unblock_sub {
1818 Event::one_event; 2198 async { Event::one_event };
1819 })->();
1820 }; 2199 };
1821 2200
1822 cfg_load; 2201 cfg_load;
1823 db_load; 2202 db_load;
1824 load_extensions; 2203 load_extensions;
1825 Event::loop; 2204 Event::loop;
1826} 2205}
1827 2206
1828############################################################################# 2207#############################################################################
1829# initialisation 2208# initialisation and cleanup
1830 2209
2210# install some emergency cleanup handlers
2211BEGIN {
2212 for my $signal (qw(INT HUP TERM)) {
2213 Event->signal (
2214 data => WF_AUTOCANCEL,
2215 signal => $signal,
2216 cb => sub {
2217 cf::cleanup "SIG$signal";
2218 },
2219 );
2220 }
2221}
2222
2223sub emergency_save {
2224 my $freeze_guard = cf::freeze_mainloop;
2225
2226 warn "enter emergency perl save\n";
2227
2228 cf::sync_job {
2229 # use a peculiar iteration method to avoid tripping on perl
2230 # refcount bugs in for. also avoids problems with players
2231 # and maps saved/Destroyed asynchronously.
2232 warn "begin emergency player save\n";
2233 for my $login (keys %cf::PLAYER) {
2234 my $pl = $cf::PLAYER{$login} or next;
2235 $pl->valid or next;
2236 $pl->save;
2237 }
2238 warn "end emergency player save\n";
2239
2240 warn "begin emergency map save\n";
2241 for my $path (keys %cf::MAP) {
2242 my $map = $cf::MAP{$path} or next;
2243 $map->valid or next;
2244 $map->save;
2245 }
2246 warn "end emergency map save\n";
2247 };
2248
2249 warn "leave emergency perl save\n";
2250}
2251
1831sub perl_reload() { 2252sub reload() {
1832 # can/must only be called in main 2253 # can/must only be called in main
1833 if ($Coro::current != $Coro::main) { 2254 if ($Coro::current != $Coro::main) {
1834 warn "can only reload from main coroutine\n"; 2255 warn "can only reload from main coroutine\n";
1835 return; 2256 return;
1836 } 2257 }
1837 2258
1838 warn "reloading..."; 2259 warn "reloading...";
1839 2260
1840 local $FREEZE = 1; 2261 my $guard = freeze_mainloop;
1841 cf::emergency_save; 2262 cf::emergency_save;
1842 2263
1843 eval { 2264 eval {
1844 # if anything goes wrong in here, we should simply crash as we already saved 2265 # if anything goes wrong in here, we should simply crash as we already saved
1845 2266
1907 cf::load_extensions; 2328 cf::load_extensions;
1908 2329
1909 # reattach attachments to objects 2330 # reattach attachments to objects
1910 warn "reattach"; 2331 warn "reattach";
1911 _global_reattach; 2332 _global_reattach;
2333 reattach $_ for values %MAP;
1912 }; 2334 };
1913 2335
1914 if ($@) { 2336 if ($@) {
1915 warn $@; 2337 warn $@;
1916 warn "error while reloading, exiting."; 2338 warn "error while reloading, exiting.";
1932 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2354 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1933 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2355 $LINK_MAP->in_memory (MAP_IN_MEMORY);
1934 2356
1935 # dirty hack because... archetypes are not yet loaded 2357 # dirty hack because... archetypes are not yet loaded
1936 Event->timer ( 2358 Event->timer (
1937 after => 2, 2359 after => 10,
1938 cb => sub { 2360 cb => sub {
1939 $_[0]->w->cancel; 2361 $_[0]->w->cancel;
1940 2362
1941 # provide some exits "home" 2363 # provide some exits "home"
1942 my $exit = cf::object::new "exit"; 2364 my $exit = cf::object::new "exit";
1963 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2385 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1964} 2386}
1965 2387
1966register "<global>", __PACKAGE__; 2388register "<global>", __PACKAGE__;
1967 2389
1968register_command "perl-reload" => sub { 2390register_command "reload" => sub {
1969 my ($who, $arg) = @_; 2391 my ($who, $arg) = @_;
1970 2392
1971 if ($who->flag (FLAG_WIZ)) { 2393 if ($who->flag (FLAG_WIZ)) {
1972 $who->message ("start of reload."); 2394 $who->message ("start of reload.");
1973 perl_reload; 2395 reload;
1974 $who->message ("end of reload."); 2396 $who->message ("end of reload.");
1975 } 2397 }
1976}; 2398};
1977 2399
1978unshift @INC, $LIBDIR; 2400unshift @INC, $LIBDIR;
1981 reentrant => 0, 2403 reentrant => 0,
1982 prio => 0, 2404 prio => 0,
1983 at => $NEXT_TICK || $TICK, 2405 at => $NEXT_TICK || $TICK,
1984 data => WF_AUTOCANCEL, 2406 data => WF_AUTOCANCEL,
1985 cb => sub { 2407 cb => sub {
1986 unless ($FREEZE) {
1987 cf::server_tick; # one server iteration 2408 cf::server_tick; # one server iteration
1988 $RUNTIME += $TICK; 2409 $RUNTIME += $TICK;
1989 }
1990
1991 $NEXT_TICK += $TICK; 2410 $NEXT_TICK += $TICK;
2411
2412 $WAIT_FOR_TICK->broadcast;
2413 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
1992 2414
1993 # if we are delayed by four ticks or more, skip them all 2415 # if we are delayed by four ticks or more, skip them all
1994 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2416 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1995 2417
1996 $TICK_WATCHER->at ($NEXT_TICK); 2418 $TICK_WATCHER->at ($NEXT_TICK);
2018 or warn "ERROR: unable to write runtime file: $!"; 2440 or warn "ERROR: unable to write runtime file: $!";
2019 })->(); 2441 })->();
2020 }, 2442 },
2021); 2443);
2022 2444
2445END { cf::emergency_save }
2446
20231 24471
2024 2448

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines