Skip to content

fix: tooldata mutex init - give before try #3832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smoe wants to merge 1 commit into
base: 2.9
Choose a base branch
from
+3 −2
Open

fix: tooldata mutex init - give before try #3832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/man/man3/rtapi_mutex.3rtapi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ init/cleanup, and realtime code.
\fBrtapi_mutex_try\fR returns 0 for if the mutex was claimed, and nonzero
otherwise.

\fBrtapi_mutex_get\fR and \fBrtapi_mutex_gif\fR have no return value.
\fBrtapi_mutex_get\fR and \fBrtapi_mutex_give\fR have no return value.
3 changes: 2 additions & 1 deletion src/emc/tooldata/tooldata_mmap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,12 @@ int tool_mmap_creator(EMC_TOOL_STAT const * ptr,int random_toolchanger)
}

tooldata_header_t *hptr = HPTR();
hptr->mutex = 0;
hptr->is_random_toolchanger = random_toolchanger;
hptr->last_index = 0;

inited = 1;
tool_mmap_mutex_give(); return 0;
return 0;
} // tool_mmap_creator();

//typ: milltask, guis (emcmodule,emcsh,...), halui
Expand Down
Loading